From c5efa0889785e0e3ce832ae5d837a9ed0006b065 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 28 Mar 2013 18:52:19 +0000 Subject: [PATCH 001/198] Created alert_json output plugin skeleton, and integrated in banyard2. modified: src/output-plugins/Makefile.am modified: src/plugbase.c new file: src/output-plugins/spo_alert_json.c new file: src/output-plugins/spo_alert_json.h --- src/output-plugins/Makefile.am | 1 + src/output-plugins/spo_alert_json.c | 546 ++++++++++++++++++++++++++++ src/output-plugins/spo_alert_json.h | 35 ++ src/plugbase.c | 1 + 4 files changed, 583 insertions(+) create mode 100644 src/output-plugins/spo_alert_json.c create mode 100644 src/output-plugins/spo_alert_json.h diff --git a/src/output-plugins/Makefile.am b/src/output-plugins/Makefile.am index 6e25d6a..f8eeeca 100644 --- a/src/output-plugins/Makefile.am +++ b/src/output-plugins/Makefile.am @@ -11,6 +11,7 @@ spo_alert_csv.c spo_alert_csv.h \ spo_alert_fast.c spo_alert_fast.h \ spo_alert_full.c spo_alert_full.h \ spo_alert_fwsam.c spo_alert_fwsam.h \ +spo_alert_json.c spo_alert_json.h \ spo_alert_prelude.c spo_alert_prelude.h \ spo_alert_syslog.c spo_alert_syslog.h \ spo_alert_test.c spo_alert_test.h \ diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c new file mode 100644 index 0000000..bb7110c --- /dev/null +++ b/src/output-plugins/spo_alert_json.c @@ -0,0 +1,546 @@ +/* +** Copyright (C) 2002-2009 Sourcefire, Inc. +** Copyright (C) 1998-2002 Martin Roesch +** Copyright (C) 2001 Brian Caswell +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License Version 2 as +** published by the Free Software Foundation. You may not use, modify or +** distribute this program under any other version of the GNU General +** Public License. +** +** 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. +*/ + +/* $Id$ */ + +/* spo_csv + * + * Purpose: output plugin for csv alerting + * + * Arguments: alert file (eventually) + * + * Effect: + * + * Alerts are written to a file in the snort csv alert format + * + * Comments: Allows use of csv alerts with other output plugin types + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#ifndef WIN32 +#include +#include +#include +#endif /* !WIN32 */ + +#ifdef HAVE_STRINGS_H +#include +#endif + +#include "decode.h" +#include "plugbase.h" +#include "parser.h" +#include "debug.h" +#include "mstring.h" +#include "util.h" +#include "log.h" +#include "map.h" +#include "unified2.h" + +#include "barnyard2.h" + +#include "sfutil/sf_textlog.h" +#include "log_text.h" +#include "ipv6_port.h" + +#define DEFAULT_CSV "timestamp,sig_generator,sig_id,sig_rev,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" + +#define DEFAULT_FILE "alert.csv" +#define DEFAULT_LIMIT (128*M_BYTES) +#define LOG_BUFFER (4*K_BYTES) + +typedef struct _AlertCSVConfig +{ + char *type; + struct _AlertCSVConfig *next; +} AlertCSVConfig; + +typedef struct _AlertCSVData +{ + TextLog* log; + char * csvargs; + char ** args; + int numargs; + AlertCSVConfig *config; +} AlertCSVData; + + +/* list of function prototypes for this preprocessor */ +static void AlertJSONInit(char *); +static AlertCSVData *AlertCSVParseArgs(char *); +static void AlertCSV(Packet *, void *, uint32_t, void *); +static void AlertCSVCleanExit(int, void *); +static void AlertCSVRestart(int, void *); +static void RealAlertCSV( + Packet*, void*, uint32_t, char **args, int numargs, TextLog* +); + +/* + * Function: SetupJSON() + * + * Purpose: Registers the output plugin keyword and initialization + * function into the output plugin list. This is the function that + * gets called from InitOutputPlugins() in plugbase.c. + * + * Arguments: None. + * + * Returns: void function + * + */ +void AlertJSONSetup(void) +{ + /* link the preprocessor keyword to the init function in + the preproc list */ + RegisterOutputPlugin("alert_json", OUTPUT_TYPE_FLAG__ALERT, AlertJSONInit); + + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Output plugin: alert_json is setup...\n");); +} + + +/* + * Function: JSONInit(char *) + * + * Purpose: Calls the argument parsing function, performs final setup on data + * structs, links the preproc function into the function list. + * + * Arguments: args => ptr to argument string + * + * Returns: void function + * + */ +static void AlertJSONInit(char *args) +{ + AlertCSVData *data; + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Output: CSV Initialized\n");); + + /* parse the argument list from the rules file */ + data = AlertCSVParseArgs(args); + + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Linking CSV functions to call lists...\n");); + + /* Set the preprocessor function into the function list */ + AddFuncToOutputList(AlertCSV, OUTPUT_TYPE__ALERT, data); + AddFuncToCleanExitList(AlertCSVCleanExit, data); + AddFuncToRestartList(AlertCSVRestart, data); +} + +/* + * Function: ParseCSVArgs(char *) + * + * Purpose: Process positional args, if any. Syntax is: + * output alert_csv: [ ["default"| []]] + * list ::= (,)* + * field ::= "dst"|"src"|"ttl" ... + * limit ::= ('G'|'M'|K') + * + * Arguments: args => argument list + * + * Returns: void function + */ +static AlertCSVData *AlertCSVParseArgs(char *args) +{ + char **toks; + int num_toks; + AlertCSVData *data; + char* filename = NULL; + unsigned long limit = DEFAULT_LIMIT; + int i; + + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "ParseCSVArgs: %s\n", args);); + data = (AlertCSVData *)SnortAlloc(sizeof(AlertCSVData)); + + if ( !data ) + { + FatalError("alert_csv: unable to allocate memory!\n"); + } + if ( !args ) args = ""; + toks = mSplit((char *)args, " \t", 4, &num_toks, '\\'); + + for (i = 0; i < num_toks; i++) + { + const char* tok = toks[i]; + char *end; + + switch (i) + { + case 0: + if ( !strcasecmp(tok, "stdout") ) + filename = SnortStrdup(tok); + + else + filename = ProcessFileOption(barnyard2_conf_for_parsing, tok); + break; + + case 1: + if ( !strcasecmp("default", tok) ) + { + data->csvargs = strdup(DEFAULT_CSV); + } + else + { + data->csvargs = strdup(toks[1]); + } + break; + + case 2: + limit = strtol(tok, &end, 10); + + if ( tok == end ) + FatalError("alert_csv error in %s(%i): %s\n", + file_name, file_line, tok); + + if ( end && toupper(*end) == 'G' ) + limit <<= 30; /* GB */ + + else if ( end && toupper(*end) == 'M' ) + limit <<= 20; /* MB */ + + else if ( end && toupper(*end) == 'K' ) + limit <<= 10; /* KB */ + break; + + case 3: + FatalError("alert_csv: error in %s(%i): %s\n", + file_name, file_line, tok); + break; + } + } + if ( !data->csvargs ) data->csvargs = strdup(DEFAULT_CSV); + if ( !filename ) filename = ProcessFileOption(barnyard2_conf_for_parsing, DEFAULT_FILE); + + mSplitFree(&toks, num_toks); + toks = mSplit(data->csvargs, ",", 128, &num_toks, 0); + + data->args = toks; + data->numargs = num_toks; + + DEBUG_WRAP(DebugMessage( + DEBUG_INIT, "alert_csv: '%s' '%s' %ld\n", filename, data->csvargs, limit + );); + data->log = TextLog_Init(filename, LOG_BUFFER, limit); + if ( filename ) free(filename); + + return data; +} + +static void AlertCSVCleanup(int signal, void *arg, const char* msg) +{ + AlertCSVData *data = (AlertCSVData *)arg; + /* close alert file */ + DEBUG_WRAP(DebugMessage(DEBUG_LOG,"%s\n", msg);); + + if(data) + { + mSplitFree(&data->args, data->numargs); + if (data->log) TextLog_Term(data->log); + free(data->csvargs); + /* free memory from SpoCSVData */ + free(data); + } +} + +static void AlertCSVCleanExit(int signal, void *arg) +{ + AlertCSVCleanup(signal, arg, "AlertCSVCleanExit"); +} + +static void AlertCSVRestart(int signal, void *arg) +{ + AlertCSVCleanup(signal, arg, "AlertCSVRestart"); +} + + +static void AlertCSV(Packet *p, void *event, uint32_t event_type, void *arg) +{ + AlertCSVData *data = (AlertCSVData *)arg; + RealAlertCSV(p, event, event_type, data->args, data->numargs, data->log); +} + +/* + * + * Function: RealAlertCSV(Packet *, char *, FILE *, char *, numargs const int) + * + * Purpose: Write a user defined CSV message + * + * Arguments: p => packet. (could be NULL) + * msg => the message to send + * args => CSV output arguements + * numargs => number of arguements + * log => Log + * Returns: void function + * + */ +static void RealAlertCSV(Packet * p, void *event, uint32_t event_type, + char **args, int numargs, TextLog* log) +{ + int num; + SigNode *sn; + char *type; + char tcpFlags[9]; + + if(p == NULL) + return; + + DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging CSV Alert data\n");); + + for (num = 0; num < numargs; num++) + { + type = args[num]; + + DEBUG_WRAP(DebugMessage(DEBUG_LOG, "CSV Got type %s %d\n", type, num);); + + if(!strncasecmp("timestamp", type, 9)) + { + LogTimeStamp(log, p); + } + else if(!strncasecmp("sig_generator",type,13)) + { + if(event != NULL) + { + TextLog_Print(log, "%lu", + (unsigned long) ntohl(((Unified2EventCommon *)event)->generator_id)); + } + } + else if(!strncasecmp("sig_id",type,6)) + { + if(event != NULL) + { + TextLog_Print(log, "%lu", + (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_id)); + } + } + else if(!strncasecmp("sig_rev",type,7)) + { + if(event != NULL) + { + TextLog_Print(log, "%lu", + (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_revision)); + } + } + else if(!strncasecmp("msg", type, 3)) + { + if ( event != NULL ) + { + sn = GetSigByGidSid(ntohl(((Unified2EventCommon *)event)->generator_id), + ntohl(((Unified2EventCommon *)event)->signature_id), + ntohl(((Unified2EventCommon *)event)->signature_revision)); + + if (sn != NULL) + { + if ( !TextLog_Quote(log, sn->msg) ) + { + FatalError("Not enough buffer space to escape msg string\n"); + } + } + } + } + else if(!strncasecmp("proto", type, 5)) + { + if(IPH_IS_VALID(p)) + { + switch (GET_IPH_PROTO(p)) + { + case IPPROTO_UDP: + TextLog_Puts(log, "UDP"); + break; + case IPPROTO_TCP: + TextLog_Puts(log, "TCP"); + break; + case IPPROTO_ICMP: + TextLog_Puts(log, "ICMP"); + break; + } + } + } + else if(!strncasecmp("ethsrc", type, 6)) + { + if(p->eh) + { + TextLog_Print(log, "%X:%X:%X:%X:%X:%X", p->eh->ether_src[0], + p->eh->ether_src[1], p->eh->ether_src[2], p->eh->ether_src[3], + p->eh->ether_src[4], p->eh->ether_src[5]); + } + } + else if(!strncasecmp("ethdst", type, 6)) + { + if(p->eh) + { + TextLog_Print(log, "%X:%X:%X:%X:%X:%X", p->eh->ether_dst[0], + p->eh->ether_dst[1], p->eh->ether_dst[2], p->eh->ether_dst[3], + p->eh->ether_dst[4], p->eh->ether_dst[5]); + } + } + else if(!strncasecmp("ethtype", type, 7)) + { + if(p->eh) + { + TextLog_Print(log, "0x%X",ntohs(p->eh->ether_type)); + } + } + else if(!strncasecmp("udplength", type, 9)) + { + if(p->udph) + TextLog_Print(log, "%d",ntohs(p->udph->uh_len)); + } + else if(!strncasecmp("ethlen", type, 6)) + { + if(p->eh) + TextLog_Print(log, "0x%X",p->pkth->len); + } +#ifndef NO_NON_ETHER_DECODER + else if(!strncasecmp("trheader", type, 8)) + { + if(p->trh) + LogTrHeader(log, p); + } +#endif + else if(!strncasecmp("srcport", type, 7)) + { + if(IPH_IS_VALID(p)) + { + switch(GET_IPH_PROTO(p)) + { + case IPPROTO_UDP: + case IPPROTO_TCP: + TextLog_Print(log, "%d", p->sp); + break; + } + } + } + else if(!strncasecmp("dstport", type, 7)) + { + if(IPH_IS_VALID(p)) + { + switch(GET_IPH_PROTO(p)) + { + case IPPROTO_UDP: + case IPPROTO_TCP: + TextLog_Print(log, "%d", p->dp); + break; + } + } + } + else if(!strncasecmp("src", type, 3)) + { + if(IPH_IS_VALID(p)) + TextLog_Puts(log, inet_ntoa(GET_SRC_ADDR(p))); + } + else if(!strncasecmp("dst", type, 3)) + { + if(IPH_IS_VALID(p)) + TextLog_Puts(log, inet_ntoa(GET_DST_ADDR(p))); + } + else if(!strncasecmp("icmptype",type,8)) + { + if(p->icmph) + { + TextLog_Print(log, "%d",p->icmph->type); + } + } + else if(!strncasecmp("icmpcode",type,8)) + { + if(p->icmph) + { + TextLog_Print(log, "%d",p->icmph->code); + } + } + else if(!strncasecmp("icmpid",type,6)) + { + if(p->icmph) + TextLog_Print(log, "%d",ntohs(p->icmph->s_icmp_id)); + } + else if(!strncasecmp("icmpseq",type,7)) + { + if(p->icmph) + TextLog_Print(log, "%d",ntohs(p->icmph->s_icmp_seq)); + } + else if(!strncasecmp("ttl",type,3)) + { + if(IPH_IS_VALID(p)) + TextLog_Print(log, "%d",GET_IPH_TTL(p)); + } + else if(!strncasecmp("tos",type,3)) + { + if(IPH_IS_VALID(p)) + TextLog_Print(log, "%d",GET_IPH_TOS(p)); + } + else if(!strncasecmp("id",type,2)) + { + if(IPH_IS_VALID(p)) + TextLog_Print(log, "%u", IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); + } + else if(!strncasecmp("iplen",type,5)) + { + if(IPH_IS_VALID(p)) + TextLog_Print(log, "%d",GET_IPH_LEN(p) << 2); + } + else if(!strncasecmp("dgmlen",type,6)) + { + if(IPH_IS_VALID(p)) + // XXX might cause a bug when IPv6 is printed? + TextLog_Print(log, "%d",ntohs(GET_IPH_LEN(p))); + } + else if(!strncasecmp("tcpseq",type,6)) + { + if(p->tcph) + TextLog_Print(log, "0x%lX",(u_long) ntohl(p->tcph->th_seq)); + } + else if(!strncasecmp("tcpack",type,6)) + { + if(p->tcph) + TextLog_Print(log, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); + } + else if(!strncasecmp("tcplen",type,6)) + { + if(p->tcph) + TextLog_Print(log, "%d",TCP_OFFSET(p->tcph) << 2); + } + else if(!strncasecmp("tcpwindow",type,9)) + { + if(p->tcph) + TextLog_Print(log, "0x%X",ntohs(p->tcph->th_win)); + } + else if(!strncasecmp("tcpflags",type,8)) + { + if(p->tcph) + { + CreateTCPFlagString(p, tcpFlags); + TextLog_Print(log, "%s", tcpFlags); + } + } + + DEBUG_WRAP(DebugMessage(DEBUG_LOG, "WOOT!\n");); + + if (num < numargs - 1) + TextLog_Putc(log, ','); + + } + TextLog_NewLine(log); + TextLog_Flush(log); +} + diff --git a/src/output-plugins/spo_alert_json.h b/src/output-plugins/spo_alert_json.h new file mode 100644 index 0000000..6fb9cef --- /dev/null +++ b/src/output-plugins/spo_alert_json.h @@ -0,0 +1,35 @@ +/* +** Copyright (C) 2002-2009 Sourcefire, Inc. +** Copyright (C) 1998-2002 Martin Roesch +** Copyright (C) 2001 Brian Caswell +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License Version 2 as +** published by the Free Software Foundation. You may not use, modify or +** distribute this program under any other version of the GNU General +** Public License. +** +** 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. +*/ + +/* $Id$ */ + +/* This file gets included in plugbase.h when it is integrated into the rest + * of the program. Sometime in The Future, I'll whip up a bad ass Perl script + * to handle automatically loading all the required info into the plugbase.* + * files. + */ + +#ifndef __SPO_JSON_H__ +#define __SPO_JSON_H__ + +void AlertJSONSetup(void); + +#endif /* __SPO_JSON_H__ */ diff --git a/src/plugbase.c b/src/plugbase.c index 3a72ea8..dbc7185 100644 --- a/src/plugbase.c +++ b/src/plugbase.c @@ -338,6 +338,7 @@ void RegisterOutputPlugins(void) AlertUnixSockSetup(); #endif /* !WIN32 */ AlertCSVSetup(); + AlertJSONSetup(); LogNullSetup(); LogAsciiSetup(); From db69fcf55bd6ba500d0b6a7e804c1ecae2722d2d Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Apr 2013 08:07:39 +0000 Subject: [PATCH 002/198] Changed names under spo_alert_json. No funtionality changed except default output names modified: output-plugins/spo_alert_json.c --- src/output-plugins/spo_alert_json.c | 112 ++++++++++++++-------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index bb7110c..ee8770e 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -21,17 +21,17 @@ /* $Id$ */ -/* spo_csv +/* spo_json * - * Purpose: output plugin for csv alerting + * Purpose: output plugin for json alerting * * Arguments: alert file (eventually) * * Effect: * - * Alerts are written to a file in the snort csv alert format + * Alerts are written to a file in the snort json alert format * - * Comments: Allows use of csv alerts with other output plugin types + * Comments: Allows use of json alerts with other output plugin types * */ @@ -68,35 +68,35 @@ #include "log_text.h" #include "ipv6_port.h" -#define DEFAULT_CSV "timestamp,sig_generator,sig_id,sig_rev,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sig_generator,sig_id,sig_rev,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" -#define DEFAULT_FILE "alert.csv" +#define DEFAULT_FILE "alert.json" #define DEFAULT_LIMIT (128*M_BYTES) #define LOG_BUFFER (4*K_BYTES) -typedef struct _AlertCSVConfig +typedef struct _AlertJSONConfig { char *type; - struct _AlertCSVConfig *next; -} AlertCSVConfig; + struct _AlertJSONConfig *next; +} AlertJSONConfig; -typedef struct _AlertCSVData +typedef struct _AlertJSONData { TextLog* log; - char * csvargs; + char * jsonargs; char ** args; int numargs; - AlertCSVConfig *config; -} AlertCSVData; + AlertJSONConfig *config; +} AlertJSONData; /* list of function prototypes for this preprocessor */ static void AlertJSONInit(char *); -static AlertCSVData *AlertCSVParseArgs(char *); -static void AlertCSV(Packet *, void *, uint32_t, void *); -static void AlertCSVCleanExit(int, void *); -static void AlertCSVRestart(int, void *); -static void RealAlertCSV( +static AlertJSONData *AlertJSONParseArgs(char *); +static void AlertJSON(Packet *, void *, uint32_t, void *); +static void AlertJSONCleanExit(int, void *); +static void AlertRestart(int, void *); +static void RealAlertJSON( Packet*, void*, uint32_t, char **args, int numargs, TextLog* ); @@ -135,25 +135,25 @@ void AlertJSONSetup(void) */ static void AlertJSONInit(char *args) { - AlertCSVData *data; - DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Output: CSV Initialized\n");); + AlertJSONData *data; + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Output: JSON Initialized\n");); /* parse the argument list from the rules file */ - data = AlertCSVParseArgs(args); + data = AlertJSONParseArgs(args); - DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Linking CSV functions to call lists...\n");); + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Linking JSON functions to call lists...\n");); /* Set the preprocessor function into the function list */ - AddFuncToOutputList(AlertCSV, OUTPUT_TYPE__ALERT, data); - AddFuncToCleanExitList(AlertCSVCleanExit, data); - AddFuncToRestartList(AlertCSVRestart, data); + AddFuncToOutputList(AlertJSON, OUTPUT_TYPE__ALERT, data); + AddFuncToCleanExitList(AlertJSONCleanExit, data); + AddFuncToRestartList(AlertRestart, data); } /* - * Function: ParseCSVArgs(char *) + * Function: ParseJSONArgs(char *) * * Purpose: Process positional args, if any. Syntax is: - * output alert_csv: [ ["default"| []]] + * output alert_json: [ ["default"| []]] * list ::= (,)* * field ::= "dst"|"src"|"ttl" ... * limit ::= ('G'|'M'|K') @@ -162,21 +162,21 @@ static void AlertJSONInit(char *args) * * Returns: void function */ -static AlertCSVData *AlertCSVParseArgs(char *args) +static AlertJSONData *AlertJSONParseArgs(char *args) { char **toks; int num_toks; - AlertCSVData *data; + AlertJSONData *data; char* filename = NULL; unsigned long limit = DEFAULT_LIMIT; int i; - DEBUG_WRAP(DebugMessage(DEBUG_INIT, "ParseCSVArgs: %s\n", args);); - data = (AlertCSVData *)SnortAlloc(sizeof(AlertCSVData)); + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "ParseJSONArgs: %s\n", args);); + data = (AlertJSONData *)SnortAlloc(sizeof(AlertJSONData)); if ( !data ) { - FatalError("alert_csv: unable to allocate memory!\n"); + FatalError("alert_json: unable to allocate memory!\n"); } if ( !args ) args = ""; toks = mSplit((char *)args, " \t", 4, &num_toks, '\\'); @@ -199,11 +199,11 @@ static AlertCSVData *AlertCSVParseArgs(char *args) case 1: if ( !strcasecmp("default", tok) ) { - data->csvargs = strdup(DEFAULT_CSV); + data->jsonargs = strdup(DEFAULT_JSON); } else { - data->csvargs = strdup(toks[1]); + data->jsonargs = strdup(toks[1]); } break; @@ -211,7 +211,7 @@ static AlertCSVData *AlertCSVParseArgs(char *args) limit = strtol(tok, &end, 10); if ( tok == end ) - FatalError("alert_csv error in %s(%i): %s\n", + FatalError("alert_json error in %s(%i): %s\n", file_name, file_line, tok); if ( end && toupper(*end) == 'G' ) @@ -225,22 +225,22 @@ static AlertCSVData *AlertCSVParseArgs(char *args) break; case 3: - FatalError("alert_csv: error in %s(%i): %s\n", + FatalError("alert_json: error in %s(%i): %s\n", file_name, file_line, tok); break; } } - if ( !data->csvargs ) data->csvargs = strdup(DEFAULT_CSV); + if ( !data->jsonargs ) data->jsonargs = strdup(DEFAULT_JSON); if ( !filename ) filename = ProcessFileOption(barnyard2_conf_for_parsing, DEFAULT_FILE); mSplitFree(&toks, num_toks); - toks = mSplit(data->csvargs, ",", 128, &num_toks, 0); + toks = mSplit(data->jsonargs, ",", 128, &num_toks, 0); data->args = toks; data->numargs = num_toks; DEBUG_WRAP(DebugMessage( - DEBUG_INIT, "alert_csv: '%s' '%s' %ld\n", filename, data->csvargs, limit + DEBUG_INIT, "alert_json: '%s' '%s' %ld\n", filename, data->jsonargs, limit );); data->log = TextLog_Init(filename, LOG_BUFFER, limit); if ( filename ) free(filename); @@ -248,9 +248,9 @@ static AlertCSVData *AlertCSVParseArgs(char *args) return data; } -static void AlertCSVCleanup(int signal, void *arg, const char* msg) +static void AlertJSONCleanup(int signal, void *arg, const char* msg) { - AlertCSVData *data = (AlertCSVData *)arg; + AlertJSONData *data = (AlertJSONData *)arg; /* close alert file */ DEBUG_WRAP(DebugMessage(DEBUG_LOG,"%s\n", msg);); @@ -258,44 +258,44 @@ static void AlertCSVCleanup(int signal, void *arg, const char* msg) { mSplitFree(&data->args, data->numargs); if (data->log) TextLog_Term(data->log); - free(data->csvargs); - /* free memory from SpoCSVData */ + free(data->jsonargs); + /* free memory from SpoJSONData */ free(data); } } -static void AlertCSVCleanExit(int signal, void *arg) +static void AlertJSONCleanExit(int signal, void *arg) { - AlertCSVCleanup(signal, arg, "AlertCSVCleanExit"); + AlertJSONCleanup(signal, arg, "AlertJSONCleanExit"); } -static void AlertCSVRestart(int signal, void *arg) +static void AlertRestart(int signal, void *arg) { - AlertCSVCleanup(signal, arg, "AlertCSVRestart"); + AlertJSONCleanup(signal, arg, "AlertRestart"); } -static void AlertCSV(Packet *p, void *event, uint32_t event_type, void *arg) +static void AlertJSON(Packet *p, void *event, uint32_t event_type, void *arg) { - AlertCSVData *data = (AlertCSVData *)arg; - RealAlertCSV(p, event, event_type, data->args, data->numargs, data->log); + AlertJSONData *data = (AlertJSONData *)arg; + RealAlertJSON(p, event, event_type, data->args, data->numargs, data->log); } /* * - * Function: RealAlertCSV(Packet *, char *, FILE *, char *, numargs const int) + * Function: RealAlertJSON(Packet *, char *, FILE *, char *, numargs const int) * - * Purpose: Write a user defined CSV message + * Purpose: Write a user defined JSON message * * Arguments: p => packet. (could be NULL) * msg => the message to send - * args => CSV output arguements + * args => JSON output arguements * numargs => number of arguements * log => Log * Returns: void function * */ -static void RealAlertCSV(Packet * p, void *event, uint32_t event_type, +static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, char **args, int numargs, TextLog* log) { int num; @@ -306,13 +306,13 @@ static void RealAlertCSV(Packet * p, void *event, uint32_t event_type, if(p == NULL) return; - DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging CSV Alert data\n");); + DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging JSON Alert data\n");); for (num = 0; num < numargs; num++) { type = args[num]; - DEBUG_WRAP(DebugMessage(DEBUG_LOG, "CSV Got type %s %d\n", type, num);); + DEBUG_WRAP(DebugMessage(DEBUG_LOG, "JSON Got type %s %d\n", type, num);); if(!strncasecmp("timestamp", type, 9)) { From eb71ecccd02f79ee7bc334bd6289de7ac1da1380 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Apr 2013 08:44:05 +0000 Subject: [PATCH 003/198] Timestamp now printed in milisenconds, instead of string --- src/output-plugins/spo_alert_json.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index ee8770e..ae3e3ea 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -74,6 +74,10 @@ #define DEFAULT_LIMIT (128*M_BYTES) #define LOG_BUFFER (4*K_BYTES) + #define FIELD_VALUE_SEPARATOR ':' + + #define JSON_TIMESTAMP_NAME "event_timestamp" + typedef struct _AlertJSONConfig { char *type; @@ -281,9 +285,14 @@ static void AlertJSON(Packet *p, void *event, uint32_t event_type, void *arg) RealAlertJSON(p, event, event_type, data->args, data->numargs, data->log); } +static void LogJSON_i64(TextLog *log,const char *fieldName,uint64_t fieldValue){ + TextLog_Quote(log,fieldName); + TextLog_Putc(log,FIELD_VALUE_SEPARATOR); + TextLog_Print(log,"%"PRIu64,fieldValue); +} + /* - * - * Function: RealAlertJSON(Packet *, char *, FILE *, char *, numargs const int) + * Function: RealAlertJSON(Packet *, char *, FILE *, char *, numargs const int) * * Purpose: Write a user defined JSON message * @@ -308,6 +317,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging JSON Alert data\n");); + TextLog_Putc(log,'{'); for (num = 0; num < numargs; num++) { type = args[num]; @@ -316,7 +326,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(!strncasecmp("timestamp", type, 9)) { - LogTimeStamp(log, p); + //LogTimeStamp(log, p); // CVS log + LogJSON_i64(log,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000); } else if(!strncasecmp("sig_generator",type,13)) { @@ -540,7 +551,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, TextLog_Putc(log, ','); } - TextLog_NewLine(log); + + TextLog_Putc(log,'}'); + //TextLog_NewLine(log); // Newline not needed. TextLog_Flush(log); } From ec29434162ef5d67e73e95f01accfe3fecd198e5 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Apr 2013 09:38:51 +0000 Subject: [PATCH 004/198] Each data type add it's own string to a json file now. --- src/output-plugins/spo_alert_json.c | 175 +++++++++++++++++++++------- 1 file changed, 135 insertions(+), 40 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index ae3e3ea..076c61a 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -74,9 +74,39 @@ #define DEFAULT_LIMIT (128*M_BYTES) #define LOG_BUFFER (4*K_BYTES) - #define FIELD_VALUE_SEPARATOR ':' +#define FIELD_VALUE_SEPARATOR ": " + +#define JSON_TIMESTAMP_NAME "event_timestamp" +#define JSON_SIG_GENERATOR_NAME "sig_generator" +#define JSON_SIG_ID_NAME "sig_id" +#define JSON_SIG_REV_NAME "rev" +#define JSON_MSG_NAME "msg" +#define JSON_PROTO_NAME "proto" +#define JSON_ETHSRC_NAME "ethsrc" +#define JSON_ETHDST_NAME "ethdst" +#define JSON_ETHTYPE_NAME "ethtype" +#define JSON_UDPLENGTH_NAME "udplength" +#define JSON_ETHLENGTH_NAME "ethlength" +#define JSON_TRHEADER_NAME "trheader" +#define JSON_SRCPORT_NAME "secport" +#define JSON_DSTPORT_NAME "dstport" +#define JSON_SRC_NAME "src" +#define JSON_DST_NAME "dst" +#define JSON_ICMPTYPE_NAME "icmptype" +#define JSON_ICMPCODE_NAME "icmpcode" +#define JSON_ICMPID_NAME "icmpid" +#define JSON_ICMPSEQ_NAME "icmpseq" +#define JSON_TTL_NAME "ttl" +#define JSON_TOS_NAME "tos" +#define JSON_ID_NAME "id" +#define JSON_IPLEN_NAME "iplen" +#define JSON_DGMLEN_NAME "dgmlen" +#define JSON_TCPSEQ_NAME "tcpseq" +#define JSON_TCPACK_NAME "tcpack" +#define JSON_TCPLEN_NAME "tcplen" +#define JSON_TCPFLAGS_NAME "tcpflags" + - #define JSON_TIMESTAMP_NAME "event_timestamp" typedef struct _AlertJSONConfig { @@ -285,10 +315,24 @@ static void AlertJSON(Packet *p, void *event, uint32_t event_type, void *arg) RealAlertJSON(p, event, event_type, data->args, data->numargs, data->log); } -static void LogJSON_i64(TextLog *log,const char *fieldName,uint64_t fieldValue){ - TextLog_Quote(log,fieldName); - TextLog_Putc(log,FIELD_VALUE_SEPARATOR); - TextLog_Print(log,"%"PRIu64,fieldValue); +static bool PrintJSONFieldName(TextLog * log,const char *fieldName){ + bool aok = TextLog_Quote(log,fieldName); + + if(aok){ + TextLog_Puts(log,FIELD_VALUE_SEPARATOR); + } + return aok; +} + +static bool LogJSON_i64(TextLog *log,const char *fieldName,uint64_t fieldValue){ + bool aok = PrintJSONFieldName(log,fieldName); + if(aok) + TextLog_Print(log,"%"PRIu64,fieldValue); + return aok; +} + +static bool LogJSON_a(TextLog *log,const char *fieldName,const char *fieldValue){ + return PrintJSONFieldName(log,fieldName) && TextLog_Quote(log,fieldValue); } /* @@ -327,30 +371,38 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(!strncasecmp("timestamp", type, 9)) { //LogTimeStamp(log, p); // CVS log - LogJSON_i64(log,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000); + if(!LogJSON_i64(log,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000)) + FatalError("Not enough buffer space to escape msg string\n"); } - else if(!strncasecmp("sig_generator",type,13)) + else if(!strncasecmp("sig_generator ",type,13)) { if(event != NULL) { - TextLog_Print(log, "%lu", - (unsigned long) ntohl(((Unified2EventCommon *)event)->generator_id)); + //TextLog_Print(log, "%lu", + // (unsigned long) ntohl(((Unified2EventCommon *)event)->generator_id)); + if(!LogJSON_i64(log,JSON_SIG_GENERATOR_NAME,ntohl(((Unified2EventCommon *)event)->generator_id))) + FatalError("Not enough buffer space to escape msg string\n"); + } } else if(!strncasecmp("sig_id",type,6)) { if(event != NULL) { - TextLog_Print(log, "%lu", - (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_id)); + //TextLog_Print(log, "%lu", + // (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_id)); + if(!LogJSON_i64(log,JSON_SIG_ID_NAME,ntohl(((Unified2EventCommon *)event)->signature_id))) + FatalError("Not enough buffer space to escape msg string\n"); } } else if(!strncasecmp("sig_rev",type,7)) { if(event != NULL) { - TextLog_Print(log, "%lu", - (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_revision)); + //TextLog_Print(log, "%lu", + // (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_revision)); + if(!LogJSON_i64(log,JSON_SIG_REV_NAME,ntohl(((Unified2EventCommon *)event)->signature_revision))) + FatalError("Not enough buffer space to escape msg string\n"); } } else if(!strncasecmp("msg", type, 3)) @@ -363,7 +415,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if (sn != NULL) { - if ( !TextLog_Quote(log, sn->msg) ) + if(!PrintJSONFieldName(log,JSON_MSG_NAME) && !TextLog_Quote(log, sn->msg) ) { FatalError("Not enough buffer space to escape msg string\n"); } @@ -377,13 +429,16 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, switch (GET_IPH_PROTO(p)) { case IPPROTO_UDP: - TextLog_Puts(log, "UDP"); + //TextLog_Puts(log, "UDP"); + LogJSON_a(log,JSON_PROTO_NAME,"UDP"); break; case IPPROTO_TCP: - TextLog_Puts(log, "TCP"); + //TextLog_Puts(log, "TCP"); + LogJSON_a(log,JSON_PROTO_NAME,"TCP"); break; case IPPROTO_ICMP: - TextLog_Puts(log, "ICMP"); + //TextLog_Puts(log, "ICMP"); + LogJSON_a(log,JSON_PROTO_NAME,"ICMP"); break; } } @@ -392,6 +447,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(p->eh) { + PrintJSONFieldName(log,JSON_ETHSRC_NAME); TextLog_Print(log, "%X:%X:%X:%X:%X:%X", p->eh->ether_src[0], p->eh->ether_src[1], p->eh->ether_src[2], p->eh->ether_src[3], p->eh->ether_src[4], p->eh->ether_src[5]); @@ -401,6 +457,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(p->eh) { + PrintJSONFieldName(log,JSON_ETHDST_NAME); TextLog_Print(log, "%X:%X:%X:%X:%X:%X", p->eh->ether_dst[0], p->eh->ether_dst[1], p->eh->ether_dst[2], p->eh->ether_dst[3], p->eh->ether_dst[4], p->eh->ether_dst[5]); @@ -410,24 +467,31 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(p->eh) { + PrintJSONFieldName(log,JSON_ETHTYPE_NAME); TextLog_Print(log, "0x%X",ntohs(p->eh->ether_type)); } } else if(!strncasecmp("udplength", type, 9)) { - if(p->udph) + if(p->udph){ + PrintJSONFieldName(log,JSON_UDPLENGTH_NAME); TextLog_Print(log, "%d",ntohs(p->udph->uh_len)); + } } else if(!strncasecmp("ethlen", type, 6)) { - if(p->eh) + if(p->eh){ + PrintJSONFieldName(log,JSON_ETHLENGTH_NAME); TextLog_Print(log, "0x%X",p->pkth->len); + } } #ifndef NO_NON_ETHER_DECODER else if(!strncasecmp("trheader", type, 8)) { - if(p->trh) + if(p->trh){ + PrintJSONFieldName(log,JSON_TRHEADER_NAME); LogTrHeader(log, p); + } } #endif else if(!strncasecmp("srcport", type, 7)) @@ -438,6 +502,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { case IPPROTO_UDP: case IPPROTO_TCP: + PrintJSONFieldName(log,JSON_SRCPORT_NAME); TextLog_Print(log, "%d", p->sp); break; } @@ -451,6 +516,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { case IPPROTO_UDP: case IPPROTO_TCP: + PrintJSONFieldName(log,JSON_DSTPORT_NAME); TextLog_Print(log, "%d", p->dp); break; } @@ -458,89 +524,118 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, } else if(!strncasecmp("src", type, 3)) { - if(IPH_IS_VALID(p)) + if(IPH_IS_VALID(p)){ + PrintJSONFieldName(log,JSON_SRC_NAME); TextLog_Puts(log, inet_ntoa(GET_SRC_ADDR(p))); + } } else if(!strncasecmp("dst", type, 3)) { - if(IPH_IS_VALID(p)) + if(IPH_IS_VALID(p)){ + PrintJSONFieldName(log,JSON_DST_NAME); TextLog_Puts(log, inet_ntoa(GET_DST_ADDR(p))); + } } else if(!strncasecmp("icmptype",type,8)) { if(p->icmph) { - TextLog_Print(log, "%d",p->icmph->type); + PrintJSONFieldName(log,JSON_ICMPTYPE_NAME); + TextLog_Print(log, "%d",p->icmph->type); } } else if(!strncasecmp("icmpcode",type,8)) { if(p->icmph) { + PrintJSONFieldName(log,JSON_ICMPCODE_NAME); TextLog_Print(log, "%d",p->icmph->code); } } else if(!strncasecmp("icmpid",type,6)) { - if(p->icmph) + if(p->icmph){ + PrintJSONFieldName(log,JSON_ICMPID_NAME); TextLog_Print(log, "%d",ntohs(p->icmph->s_icmp_id)); + } } else if(!strncasecmp("icmpseq",type,7)) { - if(p->icmph) + if(p->icmph){ + PrintJSONFieldName(log,JSON_ICMPSEQ_NAME); TextLog_Print(log, "%d",ntohs(p->icmph->s_icmp_seq)); + } } else if(!strncasecmp("ttl",type,3)) { - if(IPH_IS_VALID(p)) - TextLog_Print(log, "%d",GET_IPH_TTL(p)); + if(IPH_IS_VALID(p)){ + PrintJSONFieldName(log,JSON_TTL_NAME); + TextLog_Print(log, "%d",GET_IPH_TTL(p)); + } } else if(!strncasecmp("tos",type,3)) { - if(IPH_IS_VALID(p)) - TextLog_Print(log, "%d",GET_IPH_TOS(p)); + if(IPH_IS_VALID(p)){ + PrintJSONFieldName(log,JSON_TOS_NAME); + TextLog_Print(log, "%d",GET_IPH_TOS(p)); + } } else if(!strncasecmp("id",type,2)) { - if(IPH_IS_VALID(p)) + if(IPH_IS_VALID(p)){ + PrintJSONFieldName(log,JSON_ID_NAME); TextLog_Print(log, "%u", IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); + } } else if(!strncasecmp("iplen",type,5)) { - if(IPH_IS_VALID(p)) - TextLog_Print(log, "%d",GET_IPH_LEN(p) << 2); + if(IPH_IS_VALID(p)){ + PrintJSONFieldName(log,JSON_IPLEN_NAME); + TextLog_Print(log, "%d",GET_IPH_LEN(p) << 2); + } } else if(!strncasecmp("dgmlen",type,6)) { - if(IPH_IS_VALID(p)) + if(IPH_IS_VALID(p)){ + PrintJSONFieldName(log,JSON_DGMLEN_NAME); // XXX might cause a bug when IPv6 is printed? TextLog_Print(log, "%d",ntohs(GET_IPH_LEN(p))); + } } else if(!strncasecmp("tcpseq",type,6)) { - if(p->tcph) - TextLog_Print(log, "0x%lX",(u_long) ntohl(p->tcph->th_seq)); + if(p->tcph){ + PrintJSONFieldName(log,JSON_TCPSEQ_NAME); + TextLog_Print(log, "0x%lX",(u_long) ntohl(p->tcph->th_seq)); + } } else if(!strncasecmp("tcpack",type,6)) { - if(p->tcph) + if(p->tcph){ + PrintJSONFieldName(log,JSON_TCPACK_NAME); TextLog_Print(log, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); + } } else if(!strncasecmp("tcplen",type,6)) { - if(p->tcph) + if(p->tcph){ + PrintJSONFieldName(log,JSON_TCPLEN_NAME); TextLog_Print(log, "%d",TCP_OFFSET(p->tcph) << 2); + } } else if(!strncasecmp("tcpwindow",type,9)) { - if(p->tcph) + if(p->tcph){ + PrintJSONFieldName(log,JSON_DST_NAME); TextLog_Print(log, "0x%X",ntohs(p->tcph->th_win)); + } } else if(!strncasecmp("tcpflags",type,8)) { if(p->tcph) { CreateTCPFlagString(p, tcpFlags); + PrintJSONFieldName(log,JSON_TCPFLAGS_NAME); TextLog_Print(log, "%s", tcpFlags); } } @@ -553,7 +648,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, } TextLog_Putc(log,'}'); - //TextLog_NewLine(log); // Newline not needed. + TextLog_NewLine(log); // Newline not needed. TextLog_Flush(log); } From 25ca718409d091ffcaba03ed7665f09f4c9e8a64 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Apr 2013 10:18:51 +0000 Subject: [PATCH 005/198] FIXED: JSON invalid fields are not written at all. Before, a ",," was printed modified: output-plugins/spo_alert_json.c --- src/output-plugins/spo_alert_json.c | 69 ++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 6 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 076c61a..3dc0776 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -74,7 +74,8 @@ #define DEFAULT_LIMIT (128*M_BYTES) #define LOG_BUFFER (4*K_BYTES) -#define FIELD_VALUE_SEPARATOR ": " +#define FIELD_NAME_VALUE_SEPARATOR ": " +#define JSON_FIELDS_SEPARATOR "," #define JSON_TIMESTAMP_NAME "event_timestamp" #define JSON_SIG_GENERATOR_NAME "sig_generator" @@ -319,7 +320,7 @@ static bool PrintJSONFieldName(TextLog * log,const char *fieldName){ bool aok = TextLog_Quote(log,fieldName); if(aok){ - TextLog_Puts(log,FIELD_VALUE_SEPARATOR); + TextLog_Puts(log,FIELD_NAME_VALUE_SEPARATOR); } return aok; } @@ -373,6 +374,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, //LogTimeStamp(log, p); // CVS log if(!LogJSON_i64(log,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000)) FatalError("Not enough buffer space to escape msg string\n"); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } else if(!strncasecmp("sig_generator ",type,13)) { @@ -382,7 +385,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, // (unsigned long) ntohl(((Unified2EventCommon *)event)->generator_id)); if(!LogJSON_i64(log,JSON_SIG_GENERATOR_NAME,ntohl(((Unified2EventCommon *)event)->generator_id))) FatalError("Not enough buffer space to escape msg string\n"); - + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("sig_id",type,6)) @@ -393,6 +397,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, // (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_id)); if(!LogJSON_i64(log,JSON_SIG_ID_NAME,ntohl(((Unified2EventCommon *)event)->signature_id))) FatalError("Not enough buffer space to escape msg string\n"); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("sig_rev",type,7)) @@ -403,6 +409,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, // (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_revision)); if(!LogJSON_i64(log,JSON_SIG_REV_NAME,ntohl(((Unified2EventCommon *)event)->signature_revision))) FatalError("Not enough buffer space to escape msg string\n"); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("msg", type, 3)) @@ -419,6 +427,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { FatalError("Not enough buffer space to escape msg string\n"); } + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } } @@ -441,6 +451,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogJSON_a(log,JSON_PROTO_NAME,"ICMP"); break; } + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("ethsrc", type, 6)) @@ -451,6 +463,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, TextLog_Print(log, "%X:%X:%X:%X:%X:%X", p->eh->ether_src[0], p->eh->ether_src[1], p->eh->ether_src[2], p->eh->ether_src[3], p->eh->ether_src[4], p->eh->ether_src[5]); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("ethdst", type, 6)) @@ -461,6 +475,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, TextLog_Print(log, "%X:%X:%X:%X:%X:%X", p->eh->ether_dst[0], p->eh->ether_dst[1], p->eh->ether_dst[2], p->eh->ether_dst[3], p->eh->ether_dst[4], p->eh->ether_dst[5]); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("ethtype", type, 7)) @@ -469,6 +485,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { PrintJSONFieldName(log,JSON_ETHTYPE_NAME); TextLog_Print(log, "0x%X",ntohs(p->eh->ether_type)); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("udplength", type, 9)) @@ -476,6 +494,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(p->udph){ PrintJSONFieldName(log,JSON_UDPLENGTH_NAME); TextLog_Print(log, "%d",ntohs(p->udph->uh_len)); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("ethlen", type, 6)) @@ -483,6 +503,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(p->eh){ PrintJSONFieldName(log,JSON_ETHLENGTH_NAME); TextLog_Print(log, "0x%X",p->pkth->len); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } #ifndef NO_NON_ETHER_DECODER @@ -491,6 +513,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(p->trh){ PrintJSONFieldName(log,JSON_TRHEADER_NAME); LogTrHeader(log, p); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } #endif @@ -504,6 +528,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, case IPPROTO_TCP: PrintJSONFieldName(log,JSON_SRCPORT_NAME); TextLog_Print(log, "%d", p->sp); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); break; } } @@ -518,6 +544,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, case IPPROTO_TCP: PrintJSONFieldName(log,JSON_DSTPORT_NAME); TextLog_Print(log, "%d", p->dp); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); break; } } @@ -527,6 +555,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(IPH_IS_VALID(p)){ PrintJSONFieldName(log,JSON_SRC_NAME); TextLog_Puts(log, inet_ntoa(GET_SRC_ADDR(p))); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("dst", type, 3)) @@ -534,6 +564,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(IPH_IS_VALID(p)){ PrintJSONFieldName(log,JSON_DST_NAME); TextLog_Puts(log, inet_ntoa(GET_DST_ADDR(p))); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("icmptype",type,8)) @@ -542,6 +574,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { PrintJSONFieldName(log,JSON_ICMPTYPE_NAME); TextLog_Print(log, "%d",p->icmph->type); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("icmpcode",type,8)) @@ -550,6 +584,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { PrintJSONFieldName(log,JSON_ICMPCODE_NAME); TextLog_Print(log, "%d",p->icmph->code); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("icmpid",type,6)) @@ -557,6 +593,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(p->icmph){ PrintJSONFieldName(log,JSON_ICMPID_NAME); TextLog_Print(log, "%d",ntohs(p->icmph->s_icmp_id)); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("icmpseq",type,7)) @@ -564,6 +602,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(p->icmph){ PrintJSONFieldName(log,JSON_ICMPSEQ_NAME); TextLog_Print(log, "%d",ntohs(p->icmph->s_icmp_seq)); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("ttl",type,3)) @@ -571,6 +611,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(IPH_IS_VALID(p)){ PrintJSONFieldName(log,JSON_TTL_NAME); TextLog_Print(log, "%d",GET_IPH_TTL(p)); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("tos",type,3)) @@ -578,6 +620,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(IPH_IS_VALID(p)){ PrintJSONFieldName(log,JSON_TOS_NAME); TextLog_Print(log, "%d",GET_IPH_TOS(p)); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("id",type,2)) @@ -585,6 +629,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(IPH_IS_VALID(p)){ PrintJSONFieldName(log,JSON_ID_NAME); TextLog_Print(log, "%u", IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("iplen",type,5)) @@ -592,6 +638,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(IPH_IS_VALID(p)){ PrintJSONFieldName(log,JSON_IPLEN_NAME); TextLog_Print(log, "%d",GET_IPH_LEN(p) << 2); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("dgmlen",type,6)) @@ -600,6 +648,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, PrintJSONFieldName(log,JSON_DGMLEN_NAME); // XXX might cause a bug when IPv6 is printed? TextLog_Print(log, "%d",ntohs(GET_IPH_LEN(p))); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("tcpseq",type,6)) @@ -607,6 +657,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(p->tcph){ PrintJSONFieldName(log,JSON_TCPSEQ_NAME); TextLog_Print(log, "0x%lX",(u_long) ntohl(p->tcph->th_seq)); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("tcpack",type,6)) @@ -614,6 +666,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(p->tcph){ PrintJSONFieldName(log,JSON_TCPACK_NAME); TextLog_Print(log, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("tcplen",type,6)) @@ -621,6 +675,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(p->tcph){ PrintJSONFieldName(log,JSON_TCPLEN_NAME); TextLog_Print(log, "%d",TCP_OFFSET(p->tcph) << 2); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("tcpwindow",type,9)) @@ -628,6 +684,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(p->tcph){ PrintJSONFieldName(log,JSON_DST_NAME); TextLog_Print(log, "0x%X",ntohs(p->tcph->th_win)); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("tcpflags",type,8)) @@ -637,14 +695,13 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, CreateTCPFlagString(p, tcpFlags); PrintJSONFieldName(log,JSON_TCPFLAGS_NAME); TextLog_Print(log, "%s", tcpFlags); + if (num < numargs - 1) + TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } DEBUG_WRAP(DebugMessage(DEBUG_LOG, "WOOT!\n");); - if (num < numargs - 1) - TextLog_Putc(log, ','); - } TextLog_Putc(log,'}'); From 0df4cdd266e9d99d7698e7ebc0495fa8e2e42f19 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 5 Apr 2013 07:32:21 +0000 Subject: [PATCH 006/198] added output-plugins/spo_alert_json.h in src/plugbase.c modified: src/plugbase.c --- src/plugbase.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugbase.c b/src/plugbase.c index dbc7185..1c59d57 100644 --- a/src/plugbase.c +++ b/src/plugbase.c @@ -59,6 +59,7 @@ #include "output-plugins/spo_alert_bro.h" #include "output-plugins/spo_alert_cef.h" #include "output-plugins/spo_alert_csv.h" +#include "output-plugins/spo_alert_json.h" #include "output-plugins/spo_alert_fast.h" #include "output-plugins/spo_alert_full.h" #include "output-plugins/spo_alert_fwsam.h" From df547e1da9d4b6e10f1948fc0058ffa315abd6a5 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 5 Apr 2013 08:22:20 +0000 Subject: [PATCH 007/198] Added kafka libraries and header (in a future we will add the entire librdkafka) modified: Makefile.am new file: output-plugins/kafka/librdkafka.a new file: output-plugins/kafka/rdkafka.h new file: output-plugins/librdkafka.a --- src/Makefile.am | 3 +- src/output-plugins/kafka/librdkafka.a | Bin 0 -> 139260 bytes src/output-plugins/kafka/rdkafka.h | 520 ++++++++++++++++++++++++++ src/output-plugins/librdkafka.a | Bin 0 -> 139260 bytes 4 files changed, 522 insertions(+), 1 deletion(-) create mode 100644 src/output-plugins/kafka/librdkafka.a create mode 100644 src/output-plugins/kafka/rdkafka.h create mode 100644 src/output-plugins/librdkafka.a diff --git a/src/Makefile.am b/src/Makefile.am index 5e0242b..4534608 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,8 +29,9 @@ unified2.h \ util.c util.h barnyard2_LDADD = output-plugins/libspo.a \ +output-plugins/librdkafka.a \ input-plugins/libspi.a \ -sfutil/libsfutil.a +sfutil/libsfutil.a SUBDIRS = sfutil output-plugins input-plugins diff --git a/src/output-plugins/kafka/librdkafka.a b/src/output-plugins/kafka/librdkafka.a new file mode 100644 index 0000000000000000000000000000000000000000..4825afe3f70982284280acff115d9fe95216fbf0 GIT binary patch literal 139260 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 +#include +#include +#include + +#ifndef WITH_LIBRD + +#include "rd.h" +#include "rdaddr.h" + +#define RD_POLL_INFINITE -1 +#define RD_POLL_NOWAIT 0 + +#else + +#include +#include +#endif + +#define RD_KAFKA_TOPIC_MAXLEN 256 + +typedef enum { + RD_KAFKA_PRODUCER, + RD_KAFKA_CONSUMER, +} rd_kafka_type_t; + +typedef enum { + RD_KAFKA_STATE_DOWN, + RD_KAFKA_STATE_CONNECTING, + RD_KAFKA_STATE_UP, +} rd_kafka_state_t; + + +typedef enum { + /* Internal errors to rdkafka: */ + RD_KAFKA_RESP_ERR__BAD_MSG = -199, + RD_KAFKA_RESP_ERR__BAD_COMPRESSION = -198, + RD_KAFKA_RESP_ERR__FAIL = -197, /* See rko_payload for error string */ + /* Standard Kafka errors: */ + RD_KAFKA_RESP_ERR_UNKNOWN = -1, + RD_KAFKA_RESP_ERR_NO_ERROR = 0, + RD_KAFKA_RESP_ERR_OFFSET_OUT_OF_RANGE = 1, + RD_KAFKA_RESP_ERR_INVALID_MSG = 2, + RD_KAFKA_RESP_ERR_WRONG_PARTITION = 3, + RD_KAFKA_RESP_ERR_INVALID_FETCH_SIZE = 4, +} rd_kafka_resp_err_t; + + +/** + * Optional configuration struct passed to rd_kafka_new*(). + * See head of rdkafka.c for defaults. + * See comment below for rd_kafka_defaultconf use. + */ +typedef struct rd_kafka_conf_s { + int max_msg_size; /* Maximum receive message size. + * This is a safety precaution to + * avoid memory exhaustion in case of + * protocol hickups. */ + + int flags; +#define RD_KAFKA_CONF_F_APP_OFFSET_STORE 0x1 /* No automatic offset storage + * will be performed. The + * application needs to + * call rd_kafka_offset_store() + * explicitly. + * This may be used to make sure + * a message is properly handled + * before storing the offset. + * If not set, and an offset + * storage is available, the + * offset will be stored + * just prior to passing the + * message to the application.*/ + + struct { + int poll_interval; /* Time in milliseconds to sleep before + * trying to FETCH again if the broker + * did not return any messages for + * the last FETCH call. + * I.e.: idle poll interval. */ + + int replyq_low_thres; /* The low water threshold for the + * reply queue. + * I.e.: how many messages we'll try + * to keep in the reply queue at any + * given time. + * The reply queue is the queue of + * read messages from the broker + * that are still to be passed to + * the application. */ + + uint32_t max_size; /* The maximum size to be returned + * by FETCH. */ + + char *offset_file; /* File to read/store current + * offset from/in. + * If the path is a directory then a + * filename is generated (including + * the topic and partition) and + * appended. */ + int offset_file_flags; /* open(2) flags. */ +#define RD_KAFKA_OFFSET_FILE_FLAGMASK (O_SYNC|O_ASYNC) + + + /* For internal use. + * Use the rd_kafka_new_consumer() API instead. */ + char *topic; /* Topic to consume. */ + uint32_t partition; /* Partition to consume. */ + uint64_t offset; /* Initial offset. */ + + } consumer; + +} rd_kafka_conf_t; + + + +typedef enum { + RD_KAFKA_OP_PRODUCE, /* Application -> Kafka thread */ + RD_KAFKA_OP_FETCH, /* Kafka thread -> Application */ + RD_KAFKA_OP_ERR, /* Kafka thread -> Application */ +} rd_kafka_op_type_t; + +typedef struct rd_kafka_op_s { + TAILQ_ENTRY(rd_kafka_op_s) rko_link; + rd_kafka_op_type_t rko_type; + char *rko_topic; + uint32_t rko_partition; + int rko_flags; +#define RD_KAFKA_OP_F_FREE 0x1 /* Free the payload when done with it. */ +#define RD_KAFKA_OP_F_FREE_TOPIC 0x2 /* Free the topic when done with it. */ + /* For PRODUCE and ERR */ + char *rko_payload; + int rko_len; + /* For FETCH */ + uint64_t rko_offset; +#define rko_max_size rko_len + /* For replies */ + rd_kafka_resp_err_t rko_err; + int8_t rko_compression; + int64_t rko_offset_len; /* Length to use to advance the offset. */ +} rd_kafka_op_t; + + +typedef struct rd_kafka_q_s { + pthread_mutex_t rkq_lock; + pthread_cond_t rkq_cond; + TAILQ_HEAD(, rd_kafka_op_s) rkq_q; + int rkq_qlen; +} rd_kafka_q_t; + + + + + +/** + * Kafka handle. + */ +typedef struct rd_kafka_s { + rd_kafka_q_t rk_op; /* application -> kafka operation queue */ + rd_kafka_q_t rk_rep; /* kafka -> application reply queue */ + struct { + char name[128]; + rd_sockaddr_list_t *rsal; + int curr_addr; + int s; /* TCP socket */ + struct { + uint64_t tx_bytes; + uint64_t tx; /* Kafka-messages (not payload msgs) */ + uint64_t rx_bytes; + uint64_t rx; /* Kafka messages (not payload msgs) */ + } stats; + } rk_broker; + rd_kafka_conf_t rk_conf; + int rk_flags; + int rk_terminate; + pthread_t rk_thread; + pthread_mutex_t rk_lock; + int rk_refcnt; + rd_kafka_type_t rk_type; + rd_kafka_state_t rk_state; + struct timeval rk_tv_state_change; + union { + struct { + char *topic; + uint32_t partition; + uint64_t offset; + uint64_t app_offset; + int offset_file_fd; + } consumer; + } rk_u; +#define rk_consumer rk_u.consumer + struct { + char msg[512]; + int err; /* errno */ + } rk_err; +} rd_kafka_t; + + +/** + * Accessor functions. + * + * Locality: any thread + */ +#define rd_kafka_name(rk) ((rk)->rk_broker.name) +#define rd_kafka_state(rk) ((rk)->rk_state) + + +/** + * Destroy the Kafka handle. + * + * Locality: application thread + */ +void rd_kafka_destroy (rd_kafka_t *rk); + + +/** + * Creates a new Kafka handle and starts its operation according to the + * specified 'type'. + * + * The 'broker' argument depicts the address to the Kafka broker (sorry, + * no ZooKeeper support at this point) in the standard "[:]" format + * + * If 'broker' is NULL it defaults to "localhost:9092". + * + * If the 'broker' node name resolves to multiple addresses (and possibly + * address families) all will be used for connection attempts in + * round-robin fashion. + * + * 'conf' is an optional struct that will be copied to replace rdkafka's + * default configuration. See the 'rd_kafka_conf_t' type for more information. + * + * NOTE: Make sure SIGPIPE is either ignored or handled by the calling application. + * + * + * Returns the Kafka handle. + * + * To destroy the Kafka handle, use rd_kafka_destroy(). + * + * Locality: application thread + */ +rd_kafka_t *rd_kafka_new (rd_kafka_type_t type, const char *broker, + const rd_kafka_conf_t *conf); + +/** + * Creates a new Kafka consumer handle and sets it up for fetching messages + * from 'topic' + 'partion', beginning at 'offset'. + * + * If 'conf->consumer.offset_file' is non-NULL then the 'offset' parameter is + * ignored and the file's offset is used instead. + * + * Returns the Kafka handle. + * + * To destroy the Kafka handle, use rd_kafka_destroy(). + * + * Locality: application thread + */ +rd_kafka_t *rd_kafka_new_consumer (const char *broker, + const char *topic, + uint32_t partition, + uint64_t offset, + const rd_kafka_conf_t *conf); + +/** + * Fetches kafka messages from the internal reply queue that the kafka + * thread tries to keep populated. + * + * Will block until 'timeout_ms' expires (milliseconds, RD_POLL_NOWAIT or + * RD_POLL_INFINITE) or until a message is returned. + * + * The caller must check the reply's rko_err (RD_KAFKA_ERR_*) to distinguish + * between errors and actual data messages. + * + * Communication failure propagation: + * If rko_err is RD_KAFKA_ERR__FAIL it means a critical error has occured + * and the connection to the broker has been torn down. The application + * does not need to take any action but should log the contents of + * rko->rko_payload. + * + * Returns NULL on timeout or an 'rd_kafka_op_t *' reply on success. + * + * Locality: application thread + */ +rd_kafka_op_t *rd_kafka_consume (rd_kafka_t *rk, int timeout_ms); + +/** + * Stores the current offset in whatever storage the handle has defined. + * Must only be called by the application if RD_KAFKA_CONF_F_APP_OFFSET_STORE + * is set in conf.flags. + * + * Locality: any thread + */ +int rd_kafka_offset_store (rd_kafka_t *rk, uint64_t offset); + + + +/** + * Produce and send a single message to the broker. + * + * Locality: application thread + */ +void rd_kafka_produce (rd_kafka_t *rk, char *topic, uint32_t partition, + int msgflags, char *payload, size_t len); + +/** + * Destroys an op as returned by rd_kafka_consume(). + * + * Locality: any thread + */ +void rd_kafka_op_destroy (rd_kafka_t *rk, rd_kafka_op_t *rko); + + +/** + * Returns a human readable representation of a kafka error. + */ +const char *rd_kafka_err2str (rd_kafka_resp_err_t err); + + +/** + * Returns the current out queue length (ops waiting to be sent to the broker). + * + * Locality: any thread + */ +static inline int rd_kafka_outq_len (rd_kafka_t *rk) __attribute__((unused)); +static inline int rd_kafka_outq_len (rd_kafka_t *rk) { + return rk->rk_op.rkq_qlen; +} + + +/** + * Returns the current reply queue length (messages from the broker waiting + * for the application thread to consume). + * + * Locality: any thread + */ +static inline int rd_kafka_replyq_len (rd_kafka_t *rk) __attribute__((unused)); +static inline int rd_kafka_replyq_len (rd_kafka_t *rk) { + return rk->rk_rep.rkq_qlen; +} + + + + +/** + * The default configuration. + * When providing your own configuration to the rd_kafka_new_*() calls + * its advisable to base it on this default configuration and only + * change the relevant parts. + * I.e.: + * + * rd_kafka_conf_t myconf = rd_kafka_defaultconf; + * myconf.consumer.offset_file = "/var/kafka/offsets/"; + * rk = rd_kafka_new_consumer(, ... &myconf); + */ +extern const rd_kafka_conf_t rd_kafka_defaultconf; + + +/** + * Builtin (default) log sink: print to stderr + */ +void rd_kafka_log_print (const rd_kafka_t *rk, int level, + const char *fac, const char *buf); + + +/** + * Builtin log sink: print to syslog. + */ +void rd_kafka_log_syslog (const rd_kafka_t *rk, int level, + const char *fac, const char *buf); + + +/** + * Set logger function. + * The default is to print to stderr, but a syslog is also available, + * see rd_kafka_log_(print|syslog) for the builtin alternatives. + * Alternatively the application may provide its own logger callback. + * Or pass 'func' as NULL to disable logging. + * + * NOTE: 'rk' may be passed as NULL. + */ +void rd_kafka_set_logger (void (*func) (const rd_kafka_t *rk, int level, + const char *fac, const char *buf)); + + + +#ifdef NEED_RD_KAFKAPROTO_DEF +/* + * Kafka protocol definitions. + * This is kept as an opt-in ifdef-space to avoid name space cluttering + * for the application while still keeping the implementation to + * just two files for easy inclusion in applications in case the library + * variant is not desired. + */ + + +#define RD_KAFKA_PORT 9092 +#define RD_KAFKA_PORT_STR "9092" + +/** + * Generic Request header. + */ +struct rd_kafkap_req { + uint32_t rkpr_len; + uint16_t rkpr_type; +#define RD_KAFKAP_PRODUCE 0 +#define RD_KAFKAP_FETCH 1 +#define RD_KAFKAP_MULTIFETCH 2 +#define RD_KAFKAP_MULTIPRODUCE 3 +#define RD_KAFKAP_OFFSETS 4 + uint16_t rkpr_topic_len; + char rkpr_topic[0]; /* TOPIC and PARTITION follows */ +} RD_PACKED; + + +/** + * Generic Multi-Request header. + */ +struct rd_kafkap_multireq { + uint32_t rkpmr_len; + uint16_t rkpmr_type; + uint16_t rkpmr_topicpart_cnt; + + uint32_t rkpr_topic_len; + char rkpr_topic[0]; /* TOPIC and PARTITION follows */ +} RD_PACKED; + + +/** + * Generic Response header. + */ +struct rd_kafkap_resp { + uint32_t rkprp_len; + int16_t rkprp_error; /* rd_kafka_resp_err_t */ +} RD_PACKED; + + + +/** + * MESSAGE header + */ +struct rd_kafkap_msg { + uint32_t rkpm_len; + uint8_t rkpm_magic; +#define RD_KAFKAP_MSG_MAGIC_NO_COMPRESSION_ATTR 0 /* Not supported. */ +#define RD_KAFKAP_MSG_MAGIC_COMPRESSION_ATTR 1 + uint8_t rkpm_compression; +#define RD_KAFKAP_MSG_COMPRESSION_NONE 0 +#define RD_KAFKAP_MSG_COMPRESSION_GZIP 1 +#define RD_KAFKAP_MSG_COMPRESSION_SNAPPY 2 + uint32_t rkpm_cksum; + char rkpm_payload[0]; +} RD_PACKED; + +/** + * PRODUCE header, directly follows the request header. + */ +struct rd_kafkap_produce { + uint32_t rkpp_msgs_len; + struct rd_kafkap_msg rkpp_msgs[0]; +} RD_PACKED; + + +/** + * FETCH request header, directly follows the request header. + */ +struct rd_kafkap_fetch_req { + uint64_t rkpfr_offset; + uint32_t rkpfr_max_size; +} RD_PACKED; + +/** + * FETCH response header, directly follows the response header. + */ +struct rd_kafkap_fetch_resp { + struct rd_kafkap_msg rkpfrp_msgs[0]; +} RD_PACKED; + + + + +/** + * Helper struct containing a protocol-encoded topic+partition. + */ +struct rd_kafkap_topicpart { + int rkptp_len; + char rkptp_buf[0]; +}; + + +#endif /* NEED_KAFKAPROTO_DEF */ + diff --git a/src/output-plugins/librdkafka.a b/src/output-plugins/librdkafka.a new file mode 100644 index 0000000000000000000000000000000000000000..4825afe3f70982284280acff115d9fe95216fbf0 GIT binary patch literal 139260 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 Date: Tue, 16 Apr 2013 15:21:40 +0000 Subject: [PATCH 008/198] Added kafka output to spo_alert_json. Topic is need to know in compile time, next commit will fix that. Created sfutil/sf_kafka, to send kafka messages. Modify some makefile.am and added -lz, -lrt and -lpthread c flags, needed by kafka. Added rdkafka library too. modified: Makefile.am modified: output-plugins/spo_alert_json.c modified: sfutil/Makefile.am new file: sfutil/kafka/librdkafka.a new file: sfutil/kafka/rd.h new file: sfutil/kafka/rdaddr.h new file: sfutil/kafka/rdcrc32.h new file: sfutil/kafka/rdfile.h new file: sfutil/kafka/rdgz.h new file: sfutil/kafka/rdkafka.h new file: sfutil/kafka/rdrand.h new file: sfutil/kafka/rdtime.h new file: sfutil/kafka/rdtypes.h new file: sfutil/sf_kafka.c new file: sfutil/sf_kafka.h --- src/Makefile.am | 7 +- src/output-plugins/spo_alert_json.c | 356 +++++++++++-------- src/sfutil/Makefile.am | 1 + src/sfutil/kafka/librdkafka.a | Bin 0 -> 139260 bytes src/sfutil/kafka/rd.h | 109 ++++++ src/sfutil/kafka/rdaddr.h | 183 ++++++++++ src/sfutil/kafka/rdcrc32.h | 103 ++++++ src/sfutil/kafka/rdfile.h | 88 +++++ src/sfutil/kafka/rdgz.h | 42 +++ src/sfutil/kafka/rdkafka.h | 520 ++++++++++++++++++++++++++++ src/sfutil/kafka/rdrand.h | 45 +++ src/sfutil/kafka/rdtime.h | 89 +++++ src/sfutil/kafka/rdtypes.h | 47 +++ src/sfutil/sf_kafka.c | 276 +++++++++++++++ src/sfutil/sf_kafka.h | 134 +++++++ 15 files changed, 1858 insertions(+), 142 deletions(-) create mode 100644 src/sfutil/kafka/librdkafka.a create mode 100644 src/sfutil/kafka/rd.h create mode 100644 src/sfutil/kafka/rdaddr.h create mode 100644 src/sfutil/kafka/rdcrc32.h create mode 100644 src/sfutil/kafka/rdfile.h create mode 100644 src/sfutil/kafka/rdgz.h create mode 100644 src/sfutil/kafka/rdkafka.h create mode 100644 src/sfutil/kafka/rdrand.h create mode 100644 src/sfutil/kafka/rdtime.h create mode 100644 src/sfutil/kafka/rdtypes.h create mode 100644 src/sfutil/sf_kafka.c create mode 100644 src/sfutil/sf_kafka.h diff --git a/src/Makefile.am b/src/Makefile.am index 4534608..7da6af2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,9 +29,12 @@ unified2.h \ util.c util.h barnyard2_LDADD = output-plugins/libspo.a \ -output-plugins/librdkafka.a \ input-plugins/libspi.a \ -sfutil/libsfutil.a +sfutil/libsfutil.a \ +sfutil/kafka/librdkafka.a \ +-lpthread\ +-lz -lrt + SUBDIRS = sfutil output-plugins input-plugins diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 3dc0776..59aefaf 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -65,17 +65,25 @@ #include "barnyard2.h" #include "sfutil/sf_textlog.h" +#include "sfutil/sf_kafka.h" +#include "signal.h" #include "log_text.h" #include "ipv6_port.h" + #define DEFAULT_JSON "timestamp,sig_generator,sig_id,sig_rev,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_LIMIT (128*M_BYTES) #define LOG_BUFFER (4*K_BYTES) +#define KAFKA_PROT "kafka://" +#define KAFKA_TOPIC "redBorderIPS" +//#define KAFKA_TOPIC "rb_ips" +#define KAFKA_PARTITION 0 + #define FIELD_NAME_VALUE_SEPARATOR ": " -#define JSON_FIELDS_SEPARATOR "," +#define JSON_FIELDS_SEPARATOR ", " #define JSON_TIMESTAMP_NAME "event_timestamp" #define JSON_SIG_GENERATOR_NAME "sig_generator" @@ -108,7 +116,6 @@ #define JSON_TCPFLAGS_NAME "tcpflags" - typedef struct _AlertJSONConfig { char *type; @@ -118,6 +125,7 @@ typedef struct _AlertJSONConfig typedef struct _AlertJSONData { TextLog* log; + KafkaLog * kafka; char * jsonargs; char ** args; int numargs; @@ -125,6 +133,31 @@ typedef struct _AlertJSONData } AlertJSONData; +// ## before ##__VA_ARGS__ will erase the comma if needed. +#define LogOrKafka_Print_M(log,kafka,fmt, ...) \ + do{\ + if(log)\ + TextLog_Print(log, fmt, ##__VA_ARGS__);\ + if(kafka)\ + KafkaLog_Print(kafka, fmt, ##__VA_ARGS__);\ + }while(0) + +static inline bool LogOrKafka_Putc(TextLog * log,KafkaLog * kafka,const char c){ + return (log?TextLog_Putc(log,c):1) && (kafka?KafkaLog_Putc(kafka,c):1); +} + +static inline bool LogOrKafka_Puts(TextLog * log,KafkaLog * kafka,const char *c){ + return (log?TextLog_Puts(log,c):1) && (kafka?KafkaLog_Puts(kafka,c):1); +} + +static inline bool LogOrKafka_Quote(TextLog * log,KafkaLog * kafka,const char * msg){ + return (log?TextLog_Quote(log, msg):1) && (kafka?KafkaLog_Quote(kafka,msg):1); +} + +static inline int LogOrKafka_Flush(TextLog * log,KafkaLog * kafka){ + return (log?TextLog_Flush(log):1) && (kafka?KafkaLog_Flush(kafka):1); +} + /* list of function prototypes for this preprocessor */ static void AlertJSONInit(char *); static AlertJSONData *AlertJSONParseArgs(char *); @@ -132,7 +165,7 @@ static void AlertJSON(Packet *, void *, uint32_t, void *); static void AlertJSONCleanExit(int, void *); static void AlertRestart(int, void *); static void RealAlertJSON( - Packet*, void*, uint32_t, char **args, int numargs, TextLog* + Packet*, void*, uint32_t, char **args, int numargs, TextLog*,KafkaLog * ); /* @@ -172,6 +205,9 @@ static void AlertJSONInit(char *args) { AlertJSONData *data; DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Output: JSON Initialized\n");); + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Output: Disabling SIGPIPE signal\n");); + + signal(SIGPIPE,SIG_IGN); /* parse the argument list from the rules file */ data = AlertJSONParseArgs(args); @@ -224,7 +260,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) switch (i) { case 0: - if ( !strcasecmp(tok, "stdout") ) + if ( !strncasecmp(tok, "stdout",strlen("stdout")) || !strncasecmp(tok, "kafka://",strlen("kafka://"))) filename = SnortStrdup(tok); else @@ -277,7 +313,17 @@ static AlertJSONData *AlertJSONParseArgs(char *args) DEBUG_WRAP(DebugMessage( DEBUG_INIT, "alert_json: '%s' '%s' %ld\n", filename, data->jsonargs, limit );); - data->log = TextLog_Init(filename, LOG_BUFFER, limit); + + const bool notfile = !strncasecmp(filename,"kafka://",strlen("kafka://")); + const bool stdout = notfile && !strncasecmp(filename,"stdout",strlen("stdout")); + const char * kafka_server = stdout?filename+strlen("stdout+") : filename; // must start with kafka:// + + if(!strncasecmp(kafka_server,"kafka://",strlen("kafka://"))) + data->kafka = KafkaLog_Init(kafka_server+strlen("kafka://"),LOG_BUFFER, KAFKA_TOPIC,KAFKA_PARTITION); + + if(!notfile) + data->log = TextLog_Init(stdout?"stdout":filename, LOG_BUFFER, limit); + if ( filename ) free(filename); return data; @@ -292,7 +338,10 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) if(data) { mSplitFree(&data->args, data->numargs); - if (data->log) TextLog_Term(data->log); + if (data->log) + TextLog_Term(data->log); + if(data->kafka) + KafkaLog_Term(data->kafka); free(data->jsonargs); /* free memory from SpoJSONData */ free(data); @@ -313,29 +362,61 @@ static void AlertRestart(int signal, void *arg) static void AlertJSON(Packet *p, void *event, uint32_t event_type, void *arg) { AlertJSONData *data = (AlertJSONData *)arg; - RealAlertJSON(p, event, event_type, data->args, data->numargs, data->log); + RealAlertJSON(p, event, event_type, data->args, data->numargs, data->log,data->kafka); } -static bool PrintJSONFieldName(TextLog * log,const char *fieldName){ - bool aok = TextLog_Quote(log,fieldName); - +static bool PrintJSONFieldName(TextLog * log,KafkaLog * kafka,const char *fieldName){ + bool aok = LogOrKafka_Quote(log,kafka,fieldName); + if(aok){ - TextLog_Puts(log,FIELD_NAME_VALUE_SEPARATOR); + LogOrKafka_Puts(log,kafka,FIELD_NAME_VALUE_SEPARATOR); } return aok; } -static bool LogJSON_i64(TextLog *log,const char *fieldName,uint64_t fieldValue){ - bool aok = PrintJSONFieldName(log,fieldName); - if(aok) - TextLog_Print(log,"%"PRIu64,fieldValue); +static bool LogJSON_i64(TextLog *log,KafkaLog * kafka,const char *fieldName,uint64_t fieldValue){ + bool aok = PrintJSONFieldName(log,kafka,fieldName); + if(aok){ + if(log) + TextLog_Print(log,"%"PRIu64,fieldValue); + if(kafka) + KafkaLog_Print(kafka,"%"PRIu64,fieldValue); + } + return aok; +} + +static bool LogJSON_i32(TextLog *log,KafkaLog * kafka,const char *fieldName,uint32_t fieldValue){ + bool aok = PrintJSONFieldName(log,kafka,fieldName); + if(aok){ + if(log) + TextLog_Print(log,"%"PRIu32,fieldValue); + if(kafka) + KafkaLog_Print(kafka,"%"PRIu32,fieldValue); + } return aok; } -static bool LogJSON_a(TextLog *log,const char *fieldName,const char *fieldValue){ - return PrintJSONFieldName(log,fieldName) && TextLog_Quote(log,fieldValue); +static bool LogJSON_i16(TextLog *log,KafkaLog * kafka,const char *fieldName,uint16_t fieldValue){ + bool aok = PrintJSONFieldName(log,kafka,fieldName); + if(aok){ + if(log) + TextLog_Print(log,"%"PRIu16,fieldValue); + if(kafka) + KafkaLog_Print(kafka,"%"PRIu16,fieldValue); + } + return aok; } +static bool LogJSON_a(TextLog *log,KafkaLog *kafka,const char *fieldName,const char *fieldValue){ + bool aok = 1; + if(aok && log) + aok= PrintJSONFieldName(log,kafka,fieldName) && TextLog_Quote(log,fieldValue); + if(aok && kafka) + aok = PrintJSONFieldName(log,kafka,fieldName) && KafkaLog_Quote(kafka,fieldValue); + return aok; +} + + /* * Function: RealAlertJSON(Packet *, char *, FILE *, char *, numargs const int) * @@ -350,7 +431,7 @@ static bool LogJSON_a(TextLog *log,const char *fieldName,const char *fieldValue) * */ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, - char **args, int numargs, TextLog* log) + char **args, int numargs, TextLog* log,KafkaLog * kafka) { int num; SigNode *sn; @@ -361,8 +442,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, return; DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging JSON Alert data\n");); - - TextLog_Putc(log,'{'); + LogOrKafka_Putc(log,kafka,'{'); for (num = 0; num < numargs; num++) { type = args[num]; @@ -371,11 +451,10 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(!strncasecmp("timestamp", type, 9)) { + // LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR" "); // Commented cause timestamp will be the first forever //LogTimeStamp(log, p); // CVS log - if(!LogJSON_i64(log,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000)) + if(!LogJSON_i64(log,kafka,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000)) FatalError("Not enough buffer space to escape msg string\n"); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } else if(!strncasecmp("sig_generator ",type,13)) { @@ -383,10 +462,10 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { //TextLog_Print(log, "%lu", // (unsigned long) ntohl(((Unified2EventCommon *)event)->generator_id)); - if(!LogJSON_i64(log,JSON_SIG_GENERATOR_NAME,ntohl(((Unified2EventCommon *)event)->generator_id))) + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR" "); + if(!LogJSON_i64(log,kafka,JSON_SIG_GENERATOR_NAME,ntohl(((Unified2EventCommon *)event)->generator_id))) FatalError("Not enough buffer space to escape msg string\n"); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + } } else if(!strncasecmp("sig_id",type,6)) @@ -395,10 +474,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { //TextLog_Print(log, "%lu", // (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_id)); - if(!LogJSON_i64(log,JSON_SIG_ID_NAME,ntohl(((Unified2EventCommon *)event)->signature_id))) + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + if(!LogJSON_i64(log,kafka,JSON_SIG_ID_NAME,ntohl(((Unified2EventCommon *)event)->signature_id))) FatalError("Not enough buffer space to escape msg string\n"); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("sig_rev",type,7)) @@ -407,10 +485,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { //TextLog_Print(log, "%lu", // (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_revision)); - if(!LogJSON_i64(log,JSON_SIG_REV_NAME,ntohl(((Unified2EventCommon *)event)->signature_revision))) + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + if(!LogJSON_i64(log,kafka,JSON_SIG_REV_NAME,ntohl(((Unified2EventCommon *)event)->signature_revision))) FatalError("Not enough buffer space to escape msg string\n"); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("msg", type, 3)) @@ -423,12 +500,12 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if (sn != NULL) { - if(!PrintJSONFieldName(log,JSON_MSG_NAME) && !TextLog_Quote(log, sn->msg) ) + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + //const int msglen = strlen(sn->msg); + if(!LogJSON_a(log,kafka,JSON_MSG_NAME,sn->msg)) { FatalError("Not enough buffer space to escape msg string\n"); } - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } } @@ -436,88 +513,82 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(IPH_IS_VALID(p)) { + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); switch (GET_IPH_PROTO(p)) { case IPPROTO_UDP: //TextLog_Puts(log, "UDP"); - LogJSON_a(log,JSON_PROTO_NAME,"UDP"); + LogJSON_a(log,kafka,JSON_PROTO_NAME,"UDP"); break; case IPPROTO_TCP: //TextLog_Puts(log, "TCP"); - LogJSON_a(log,JSON_PROTO_NAME,"TCP"); + LogJSON_a(log,kafka,JSON_PROTO_NAME,"TCP"); break; case IPPROTO_ICMP: //TextLog_Puts(log, "ICMP"); - LogJSON_a(log,JSON_PROTO_NAME,"ICMP"); + LogJSON_a(log,kafka,JSON_PROTO_NAME,"ICMP"); break; } - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("ethsrc", type, 6)) { if(p->eh) { - PrintJSONFieldName(log,JSON_ETHSRC_NAME); - TextLog_Print(log, "%X:%X:%X:%X:%X:%X", p->eh->ether_src[0], + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_ETHSRC_NAME); + LogOrKafka_Print_M(log, kafka, "\"%X:%X:%X:%X:%X:%X\"", p->eh->ether_src[0], p->eh->ether_src[1], p->eh->ether_src[2], p->eh->ether_src[3], p->eh->ether_src[4], p->eh->ether_src[5]); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("ethdst", type, 6)) { if(p->eh) { - PrintJSONFieldName(log,JSON_ETHDST_NAME); - TextLog_Print(log, "%X:%X:%X:%X:%X:%X", p->eh->ether_dst[0], + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_ETHDST_NAME); + LogOrKafka_Print_M(log, kafka, "\"%X:%X:%X:%X:%X:%X\"", p->eh->ether_dst[0], p->eh->ether_dst[1], p->eh->ether_dst[2], p->eh->ether_dst[3], p->eh->ether_dst[4], p->eh->ether_dst[5]); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); } } else if(!strncasecmp("ethtype", type, 7)) { if(p->eh) { - PrintJSONFieldName(log,JSON_ETHTYPE_NAME); - TextLog_Print(log, "0x%X",ntohs(p->eh->ether_type)); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_ETHTYPE_NAME); + LogOrKafka_Print_M(log, kafka, "%"PRIu16,ntohs(p->eh->ether_type)); } } else if(!strncasecmp("udplength", type, 9)) { if(p->udph){ - PrintJSONFieldName(log,JSON_UDPLENGTH_NAME); - TextLog_Print(log, "%d",ntohs(p->udph->uh_len)); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_UDPLENGTH_NAME); + LogOrKafka_Print_M(log, kafka, "%"PRIu16,ntohs(p->udph->uh_len)); } } else if(!strncasecmp("ethlen", type, 6)) { if(p->eh){ - PrintJSONFieldName(log,JSON_ETHLENGTH_NAME); - TextLog_Print(log, "0x%X",p->pkth->len); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_ETHLENGTH_NAME); + LogOrKafka_Print_M(log, kafka, "%"PRIu16,p->pkth->len); } } #ifndef NO_NON_ETHER_DECODER else if(!strncasecmp("trheader", type, 8)) { if(p->trh){ - PrintJSONFieldName(log,JSON_TRHEADER_NAME); - LogTrHeader(log, p); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_TRHEADER_NAME); + if(log) LogTrHeader(log, p); } } #endif + else if(!strncasecmp("srcport", type, 7)) { if(IPH_IS_VALID(p)) @@ -526,10 +597,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { case IPPROTO_UDP: case IPPROTO_TCP: - PrintJSONFieldName(log,JSON_SRCPORT_NAME); - TextLog_Print(log, "%d", p->sp); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_SRCPORT_NAME); + LogOrKafka_Print_M(log, kafka, "%d", p->sp); break; } } @@ -542,10 +612,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { case IPPROTO_UDP: case IPPROTO_TCP: - PrintJSONFieldName(log,JSON_DSTPORT_NAME); - TextLog_Print(log, "%d", p->dp); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_DSTPORT_NAME); + LogOrKafka_Print_M(log, kafka, "%d", p->dp); break; } } @@ -553,159 +622,166 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, else if(!strncasecmp("src", type, 3)) { if(IPH_IS_VALID(p)){ - PrintJSONFieldName(log,JSON_SRC_NAME); - TextLog_Puts(log, inet_ntoa(GET_SRC_ADDR(p))); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + /* + String version + PrintJSONFieldName(log,kafka,JSON_SRC_NAME); + LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); + */ + LogJSON_i32(log,kafka,JSON_SRC_NAME,ntohl(GET_SRC_ADDR(p).s_addr)); } } else if(!strncasecmp("dst", type, 3)) { if(IPH_IS_VALID(p)){ - PrintJSONFieldName(log,JSON_DST_NAME); - TextLog_Puts(log, inet_ntoa(GET_DST_ADDR(p))); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + /* + String version + PrintJSONFieldName(log,kafka,JSON_DST_NAME); + LogOrKafka_Puts(log,kafka, inet_ntoa(GET_DST_ADDR(p))); + */ + LogJSON_i32(log,kafka,JSON_SRC_NAME,ntohl(GET_SRC_ADDR(p).s_addr)); } } else if(!strncasecmp("icmptype",type,8)) { if(p->icmph) { - PrintJSONFieldName(log,JSON_ICMPTYPE_NAME); - TextLog_Print(log, "%d",p->icmph->type); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_ICMPTYPE_NAME); + LogOrKafka_Print_M(log, kafka, "%d",p->icmph->type); } } else if(!strncasecmp("icmpcode",type,8)) { if(p->icmph) { - PrintJSONFieldName(log,JSON_ICMPCODE_NAME); - TextLog_Print(log, "%d",p->icmph->code); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_ICMPCODE_NAME); + LogOrKafka_Print_M(log, kafka, "%d",p->icmph->code); } } else if(!strncasecmp("icmpid",type,6)) { if(p->icmph){ - PrintJSONFieldName(log,JSON_ICMPID_NAME); - TextLog_Print(log, "%d",ntohs(p->icmph->s_icmp_id)); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_ICMPID_NAME); + LogOrKafka_Print_M(log, kafka, "%d",ntohs(p->icmph->s_icmp_id)); } } else if(!strncasecmp("icmpseq",type,7)) { if(p->icmph){ - PrintJSONFieldName(log,JSON_ICMPSEQ_NAME); - TextLog_Print(log, "%d",ntohs(p->icmph->s_icmp_seq)); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + /* Doesn't work because "%d" arbitrary + PrintJSONFieldName(log,kafka,JSON_ICMPSEQ_NAME); + LogOrKafka_Print_M(log, kafka, "%d",ntohs(p->icmph->s_icmp_seq)); + */ + LogJSON_i16(log,kafka,JSON_ICMPSEQ_NAME,ntohs(p->icmph->s_icmp_seq)); } } else if(!strncasecmp("ttl",type,3)) { if(IPH_IS_VALID(p)){ - PrintJSONFieldName(log,JSON_TTL_NAME); - TextLog_Print(log, "%d",GET_IPH_TTL(p)); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_TTL_NAME); + LogOrKafka_Print_M(log, kafka, "%d",GET_IPH_TTL(p)); } } else if(!strncasecmp("tos",type,3)) { if(IPH_IS_VALID(p)){ - PrintJSONFieldName(log,JSON_TOS_NAME); - TextLog_Print(log, "%d",GET_IPH_TOS(p)); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_TOS_NAME); + LogOrKafka_Print_M(log, kafka, "%d",GET_IPH_TOS(p)); } } else if(!strncasecmp("id",type,2)) { if(IPH_IS_VALID(p)){ - PrintJSONFieldName(log,JSON_ID_NAME); - TextLog_Print(log, "%u", IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_ID_NAME); + if(log) + TextLog_Print(log, "%u", IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); + else + KafkaLog_Print(kafka,"%u", IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); } } else if(!strncasecmp("iplen",type,5)) { if(IPH_IS_VALID(p)){ - PrintJSONFieldName(log,JSON_IPLEN_NAME); - TextLog_Print(log, "%d",GET_IPH_LEN(p) << 2); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_IPLEN_NAME); + LogOrKafka_Print_M(log, kafka, "%d",GET_IPH_LEN(p) << 2); } } else if(!strncasecmp("dgmlen",type,6)) { if(IPH_IS_VALID(p)){ - PrintJSONFieldName(log,JSON_DGMLEN_NAME); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_DGMLEN_NAME); // XXX might cause a bug when IPv6 is printed? - TextLog_Print(log, "%d",ntohs(GET_IPH_LEN(p))); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Print_M(log, kafka, "%d",ntohs(GET_IPH_LEN(p))); } } else if(!strncasecmp("tcpseq",type,6)) { if(p->tcph){ - PrintJSONFieldName(log,JSON_TCPSEQ_NAME); - TextLog_Print(log, "0x%lX",(u_long) ntohl(p->tcph->th_seq)); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + // PrintJSONFieldName(log,kafka,JSON_TCPSEQ_NAME); // hex format + // LogOrKafka_Print_M(log, kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); // hex format + LogJSON_i32(log,kafka,JSON_TCPSEQ_NAME,ntohl(p->tcph->th_seq)); } } else if(!strncasecmp("tcpack",type,6)) { if(p->tcph){ - PrintJSONFieldName(log,JSON_TCPACK_NAME); - TextLog_Print(log, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + // PrintJSONFieldName(log,kafka,JSON_TCPACK_NAME); + // LogOrKafka_Print_M(log, kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); + LogJSON_i32(log,kafka,JSON_TCPSEQ_NAME,ntohl(p->tcph->th_ack)); } } + else if(!strncasecmp("tcplen",type,6)) { if(p->tcph){ - PrintJSONFieldName(log,JSON_TCPLEN_NAME); - TextLog_Print(log, "%d",TCP_OFFSET(p->tcph) << 2); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_TCPLEN_NAME); + LogOrKafka_Print_M(log, kafka, "%d",TCP_OFFSET(p->tcph) << 2); } } else if(!strncasecmp("tcpwindow",type,9)) { if(p->tcph){ - PrintJSONFieldName(log,JSON_DST_NAME); - TextLog_Print(log, "0x%X",ntohs(p->tcph->th_win)); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + //PrintJSONFieldName(log,kafka,JSON_DST_NAME); // hex format + //LogOrKafka_Print_M(log, kafka, "0x%X",ntohs(p->tcph->th_win)); // hex format + LogJSON_i16(log,kafka,JSON_TCPSEQ_NAME,ntohs(p->tcph->th_win)); } } else if(!strncasecmp("tcpflags",type,8)) { if(p->tcph) { + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); CreateTCPFlagString(p, tcpFlags); - PrintJSONFieldName(log,JSON_TCPFLAGS_NAME); - TextLog_Print(log, "%s", tcpFlags); - if (num < numargs - 1) - TextLog_Puts(log, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(log,kafka,JSON_TCPFLAGS_NAME); + LogOrKafka_Quote(log, kafka, tcpFlags); } } - DEBUG_WRAP(DebugMessage(DEBUG_LOG, "WOOT!\n");); } - TextLog_Putc(log,'}'); - TextLog_NewLine(log); // Newline not needed. - TextLog_Flush(log); + if(log){ + TextLog_Putc(log,'}'); + TextLog_NewLine(log); + TextLog_Flush(log); + }else{ + KafkaLog_Putc(kafka,'}'); + //KafkaLog_NewLine(kafka); // Newline not needed. + KafkaLog_Flush(kafka); + } } diff --git a/src/sfutil/Makefile.am b/src/sfutil/Makefile.am index 1171e29..5ad1b68 100644 --- a/src/sfutil/Makefile.am +++ b/src/sfutil/Makefile.am @@ -12,6 +12,7 @@ libsfutil_a_SOURCES = bitop.h \ sf_iph.c sf_iph.h \ sf_ipvar.c sf_ipvar.h \ sf_textlog.c sf_textlog.h \ + sf_kafka.c sf_kafka.h \ sf_vartable.c sf_vartable.h diff --git a/src/sfutil/kafka/librdkafka.a b/src/sfutil/kafka/librdkafka.a new file mode 100644 index 0000000000000000000000000000000000000000..4825afe3f70982284280acff115d9fe95216fbf0 GIT binary patch literal 139260 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "rdtypes.h" + + +#ifndef likely +#define likely(x) __builtin_expect((x),1) +#endif +#ifndef unlikely +#define unlikely(x) __builtin_expect((x),0) +#endif + +#define RD_UNUSED __attribute__((unused)) +#define RD_PACKED __attribute__((packed)) + +#define RD_ARRAY_SIZE(A) (sizeof((A)) / sizeof(*(A))) +#define RD_ARRAYSIZE(A) RD_ARRAY_SIZE(A) +#define RD_SIZEOF(TYPE,MEMBER) sizeof(((TYPE *)NULL)->MEMBER) +#define RD_OFFSETOF(TYPE,MEMBER) ((size_t) &(((TYPE *)NULL)->MEMBER)) + +/** + * Returns the 'I'th array element from static sized array 'A' + * or NULL if 'I' is out of range. + * 'PFX' is an optional prefix to provide the correct return type. + */ +#define RD_ARRAY_ELEM(A,I,PFX...) \ + ((unsigned int)(I) < RD_ARRAY_SIZE(A) ? PFX (A)[(I)] : NULL) + + +#define RD_STRINGIFY(X) # X + + + +#define RD_MIN(a,b) ((a) < (b) ? (a) : (b)) +#define RD_MAX(a,b) ((a) > (b) ? (a) : (b)) + + +/** + * Cap an integer (of any type) to reside within the defined limit. + */ +#define RD_INT_CAP(val,low,hi) \ + ((val) < (low) ? low : ((val) > (hi) ? (hi) : (val))) + + +#define rd_atomic_add(PTR,VAL) __sync_add_and_fetch(PTR,VAL) +#define rd_atomic_sub(PTR,VAL) __sync_sub_and_fetch(PTR,VAL) + +#define rd_atomic_add_prev(PTR,VAL) __sync_fetch_and_add(PTR,VAL) +#define rd_atomic_sub_prev(PTR,VAL) __sync_fetch_and_sub(PTR,VAL) + + + +#ifndef be64toh +#include + +#if __BYTE_ORDER == __BIG_ENDIAN +#define be64toh(x) (x) +#else +# if __BYTE_ORDER == __LITTLE_ENDIAN +#define be64toh(x) bswap_64(x) +# endif +#endif + +#define htobe64(x) be64toh(x) +#endif + + +void rd_init (void); diff --git a/src/sfutil/kafka/rdaddr.h b/src/sfutil/kafka/rdaddr.h new file mode 100644 index 0000000..213b2d2 --- /dev/null +++ b/src/sfutil/kafka/rdaddr.h @@ -0,0 +1,183 @@ +/* + * librd - Rapid Development C library + * + * Copyright (c) 2012, Magnus Edenhill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include +#include +#include + +/** + * rd_sockaddr_inx_t is a union for either ipv4 or ipv6 sockaddrs. + * It provides conveniant abstraction of AF_INET* agnostic operations. + */ +typedef union { + struct sockaddr_in in; + struct sockaddr_in6 in6; +} rd_sockaddr_inx_t; +#define sinx_family in.sin_family +#define sinx_addr in.sin_addr +#define RD_SOCKADDR_INX_LEN(sinx) \ + ((sinx)->sinx_family == AF_INET ? sizeof(struct sockaddr_in) : \ + (sinx)->sinx_family == AF_INET6 ? sizeof(struct sockaddr_in6): \ + sizeof(rd_sockaddr_inx_t)) +#define RD_SOCKADDR_INX_PORT(sinx) \ + ((sinx)->sinx_family == AF_INET ? (sinx)->in.sin_port : \ + (sinx)->sinx_family == AF_INET6 ? (sinx)->in6.sin6_port : 0) + +#define RD_SOCKADDR_INX_PORT_SET(sinx,port) do { \ + if ((sinx)->sinx_family == AF_INET) \ + (sinx)->in.sin_port = port; \ + else if ((sinx)->sinx_family == AF_INET6) \ + (sinx)->in6.sin6_port = port; \ + } while (0) + + + +/** + * Returns a thread-local temporary string (may be called up to 32 times + * without buffer wrapping) containing the human string representation + * of the sockaddr (which should be AF_INET or AF_INET6 at this point). + * If the RD_SOCKADDR2STR_F_PORT is provided the port number will be + * appended to the string. + * IPv6 address enveloping ("[addr]:port") will also be performed + * if .._F_PORT is set. + */ +#define RD_SOCKADDR2STR_F_PORT 0x1 /* Append the port. */ +#define RD_SOCKADDR2STR_F_RESOLVE 0x2 /* Try to resolve address to hostname. */ +#define RD_SOCKADDR2STR_F_FAMILY 0x4 /* Prepend address family. */ +#define RD_SOCKADDR2STR_F_NICE /* Nice and friendly output */ \ + (RD_SOCKADDR2STR_F_PORT | RD_SOCKADDR2STR_F_RESOLVE) +const char *rd_sockaddr2str (const void *addr, int flags); + + +/** + * Splits a node:service definition up into their node and svc counterparts + * suitable for passing to getaddrinfo(). + * Returns NULL on success (and temporarily available pointers in '*node' + * and '*svc') or error string on failure. + * + * Thread-safe but returned buffers in '*node' and '*svc' are only + * usable until the next call to rd_addrinfo_prepare() in the same thread. + */ +const char *rd_addrinfo_prepare (const char *nodesvc, + char **node, char **svc); + + + +typedef struct rd_sockaddr_list_s { + int rsal_cnt; + int rsal_curr; + rd_sockaddr_inx_t rsal_addr[0]; +} rd_sockaddr_list_t; + + +/** + * Returns the next address from a sockaddr list and updates + * the current-index to point to it. + * + * Typical usage is for round-robin connection attempts or similar: + * while (1) { + * rd_sockaddr_inx_t *sinx = rd_sockaddr_list_next(my_server_list); + * if (do_connect((struct sockaddr *)sinx) == -1) { + * sleep(1); + * continue; + * } + * ... + * } + * + */ + +static inline rd_sockaddr_inx_t * +rd_sockaddr_list_next (rd_sockaddr_list_t *rsal) RD_UNUSED; +static inline rd_sockaddr_inx_t * +rd_sockaddr_list_next (rd_sockaddr_list_t *rsal) { + rsal->rsal_curr = (rsal->rsal_curr + 1) % rsal->rsal_cnt; + return &rsal->rsal_addr[rsal->rsal_curr]; +} + + +#define RD_SOCKADDR_LIST_FOREACH(sinx, rsal) \ + for ((sinx) = &(rsal)->rsal_addr[0] ; \ + (sinx) < &(rsal)->rsal_addr[(rsal)->rsal_len] ; \ + (sinx)++) + +/** + * Wrapper for getaddrinfo(3) that performs these additional tasks: + * - Input is a combined "[:]" string, with support for + * IPv6 enveloping ("[addr]:port"). + * - Returns a rd_sockaddr_list_t which must be freed with + * rd_sockaddr_list_destroy() when done with it. + * - Automatically shuffles the returned address list to provide + * round-robin (unless RD_AI_NOSHUFFLE is provided in 'flags'). + * + * Thread-safe. + */ +#define RD_AI_NOSHUFFLE 0x10000000 /* Dont shuffle returned address list. + * FIXME: Guessing non-used bits like this + * is a bad idea. */ + +rd_sockaddr_list_t *rd_getaddrinfo (const char *nodesvc, const char *defsvc, + int flags, int family, + int socktype, int protocol, + const char **errstr); + + + +/** + * Frees a sockaddr list. + * + * Thread-safe. + */ +void rd_sockaddr_list_destroy (rd_sockaddr_list_t *rsal); + + + +/** + * Returns the human readable name of a socket family. + */ +static const char *rd_family2str (int af) RD_UNUSED; +static const char *rd_family2str (int af) { + static const char *names[] = { + [AF_LOCAL] = "local", + [AF_INET] = "inet", + [AF_INET6] = "inet6", + [AF_NETLINK] = "netlink", + [AF_ROUTE] = "route", + [AF_PACKET] = "packet", + [AF_BLUETOOTH] = "bluetooth", + }; + + if (unlikely(af >= RD_ARRAYSIZE(names))) { + static __thread char tmp[16]; + snprintf(tmp, sizeof(tmp), "af-%i", af); + return tmp; + } + + return names[af]; +} diff --git a/src/sfutil/kafka/rdcrc32.h b/src/sfutil/kafka/rdcrc32.h new file mode 100644 index 0000000..a79e3f5 --- /dev/null +++ b/src/sfutil/kafka/rdcrc32.h @@ -0,0 +1,103 @@ +/** + * \file rdcrc32.h + * Functions and types for CRC checks. + * + * Generated on Tue May 8 17:36:59 2012, + * by pycrc v0.7.10, http://www.tty1.net/pycrc/ + * + * NOTE: Contains librd modifications: + * - rd_crc32() helper. + * - __RDCRC32___H__ define (was missing the '32' part). + * + * using the configuration: + * Width = 32 + * Poly = 0x04c11db7 + * XorIn = 0xffffffff + * ReflectIn = True + * XorOut = 0xffffffff + * ReflectOut = True + * Algorithm = table-driven + *****************************************************************************/ +#ifndef __RDCRC32___H__ +#define __RDCRC32___H__ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + + +/** + * The definition of the used algorithm. + *****************************************************************************/ +#define CRC_ALGO_TABLE_DRIVEN 1 + + +/** + * The type of the CRC values. + * + * This type must be big enough to contain at least 32 bits. + *****************************************************************************/ +typedef uint32_t rd_crc32_t; + + +/** + * Reflect all bits of a \a data word of \a data_len bytes. + * + * \param data The data word to be reflected. + * \param data_len The width of \a data expressed in number of bits. + * \return The reflected data. + *****************************************************************************/ +rd_crc32_t rd_crc32_reflect(rd_crc32_t data, size_t data_len); + + +/** + * Calculate the initial crc value. + * + * \return The initial crc value. + *****************************************************************************/ +static inline rd_crc32_t rd_crc32_init(void) +{ + return 0xffffffff; +} + + +/** + * Update the crc value with new data. + * + * \param crc The current crc value. + * \param data Pointer to a buffer of \a data_len bytes. + * \param data_len Number of bytes in the \a data buffer. + * \return The updated crc value. + *****************************************************************************/ +rd_crc32_t rd_crc32_update(rd_crc32_t crc, const unsigned char *data, size_t data_len); + + +/** + * Calculate the final crc value. + * + * \param crc The current crc value. + * \return The final crc value. + *****************************************************************************/ +static inline rd_crc32_t rd_crc32_finalize(rd_crc32_t crc) +{ + return crc ^ 0xffffffff; +} + + +/** + * Wrapper for performing CRC32 on the provided buffer. + */ +static inline rd_crc32_t rd_crc32 (const char *data, size_t data_len) { + return rd_crc32_finalize(rd_crc32_update(rd_crc32_init(), + (const unsigned char *)data, + data_len)); +} + +#ifdef __cplusplus +} /* closing brace for extern "C" */ +#endif + +#endif /* __RDCRC32___H__ */ diff --git a/src/sfutil/kafka/rdfile.h b/src/sfutil/kafka/rdfile.h new file mode 100644 index 0000000..7ce7b6b --- /dev/null +++ b/src/sfutil/kafka/rdfile.h @@ -0,0 +1,88 @@ +/* + * librd - Rapid Development C library + * + * Copyright (c) 2012, Magnus Edenhill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include +#include +#include +#include +#include + + +/** + * Behaves pretty much like basename(3) but does not alter the + * input string in any way. + */ +const char *rd_basename (const char *path); + +/** + * Returns the current directory in a static buffer. + */ +const char *rd_pwd (void); + + +/** + * Returns the size of the file, or -1 on failure. + */ +ssize_t rd_file_size (const char *path); + +/** + * Returns the size of the file already opened, or -1 on failure. + */ +ssize_t rd_file_size_fd (int fd); + + +/** + * Performs stat(2) on 'path' and returns 'struct stat.st_mode' on success + * or 0 on failure. + * + * Example usage: + * if (S_ISDIR(rd_file_mode(mypath))) + * .. + */ +mode_t rd_file_mode (const char *path); + + +/** + * Opens the specified file and reads the entire content into a malloced + * buffer which is null-terminated. The actual length of the buffer, without + * the conveniant null-terminator, is returned in '*lenp'. + * The buffer is returned, or NULL on failure. + */ +char *rd_file_read (const char *path, int *lenp); + + +/** + * Writes 'buf' of 'len' bytes to 'path'. + * Hint: Use O_APPEND or O_TRUNC in 'flags'. + * Returns 0 on success or -1 on error. + * See open(2) for more info. + */ +int rd_file_write (const char *path, const char *buf, int len, + int flags, mode_t mode); diff --git a/src/sfutil/kafka/rdgz.h b/src/sfutil/kafka/rdgz.h new file mode 100644 index 0000000..db6cb12 --- /dev/null +++ b/src/sfutil/kafka/rdgz.h @@ -0,0 +1,42 @@ +/* + * librd - Rapid Development C library + * + * Copyright (c) 2012, Magnus Edenhill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +/** + * Simple gzip decompression returning the inflated data + * in a malloced buffer. + * '*decompressed_lenp' must be 0 if the length of the uncompressed data + * is not known in which case it will be calculated. + * The returned buffer is nul-terminated (the actual allocated length + * is '*decompressed_lenp'+1. + * + * The decompressed length is returned in '*decompressed_lenp'. + */ +void *rd_gz_decompress (void *compressed, int compressed_len, + uint64_t *decompressed_lenp); diff --git a/src/sfutil/kafka/rdkafka.h b/src/sfutil/kafka/rdkafka.h new file mode 100644 index 0000000..d584ffd --- /dev/null +++ b/src/sfutil/kafka/rdkafka.h @@ -0,0 +1,520 @@ +/* + * librdkafka - Apache Kafka C library + * + * Copyright (c) 2012, Magnus Edenhill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include +#include +#include +#include + +#ifndef WITH_LIBRD + +#include "rd.h" +#include "rdaddr.h" + +#define RD_POLL_INFINITE -1 +#define RD_POLL_NOWAIT 0 + +#else + +#include +#include +#endif + +#define RD_KAFKA_TOPIC_MAXLEN 256 + +typedef enum { + RD_KAFKA_PRODUCER, + RD_KAFKA_CONSUMER, +} rd_kafka_type_t; + +typedef enum { + RD_KAFKA_STATE_DOWN, + RD_KAFKA_STATE_CONNECTING, + RD_KAFKA_STATE_UP, +} rd_kafka_state_t; + + +typedef enum { + /* Internal errors to rdkafka: */ + RD_KAFKA_RESP_ERR__BAD_MSG = -199, + RD_KAFKA_RESP_ERR__BAD_COMPRESSION = -198, + RD_KAFKA_RESP_ERR__FAIL = -197, /* See rko_payload for error string */ + /* Standard Kafka errors: */ + RD_KAFKA_RESP_ERR_UNKNOWN = -1, + RD_KAFKA_RESP_ERR_NO_ERROR = 0, + RD_KAFKA_RESP_ERR_OFFSET_OUT_OF_RANGE = 1, + RD_KAFKA_RESP_ERR_INVALID_MSG = 2, + RD_KAFKA_RESP_ERR_WRONG_PARTITION = 3, + RD_KAFKA_RESP_ERR_INVALID_FETCH_SIZE = 4, +} rd_kafka_resp_err_t; + + +/** + * Optional configuration struct passed to rd_kafka_new*(). + * See head of rdkafka.c for defaults. + * See comment below for rd_kafka_defaultconf use. + */ +typedef struct rd_kafka_conf_s { + int max_msg_size; /* Maximum receive message size. + * This is a safety precaution to + * avoid memory exhaustion in case of + * protocol hickups. */ + + int flags; +#define RD_KAFKA_CONF_F_APP_OFFSET_STORE 0x1 /* No automatic offset storage + * will be performed. The + * application needs to + * call rd_kafka_offset_store() + * explicitly. + * This may be used to make sure + * a message is properly handled + * before storing the offset. + * If not set, and an offset + * storage is available, the + * offset will be stored + * just prior to passing the + * message to the application.*/ + + struct { + int poll_interval; /* Time in milliseconds to sleep before + * trying to FETCH again if the broker + * did not return any messages for + * the last FETCH call. + * I.e.: idle poll interval. */ + + int replyq_low_thres; /* The low water threshold for the + * reply queue. + * I.e.: how many messages we'll try + * to keep in the reply queue at any + * given time. + * The reply queue is the queue of + * read messages from the broker + * that are still to be passed to + * the application. */ + + uint32_t max_size; /* The maximum size to be returned + * by FETCH. */ + + char *offset_file; /* File to read/store current + * offset from/in. + * If the path is a directory then a + * filename is generated (including + * the topic and partition) and + * appended. */ + int offset_file_flags; /* open(2) flags. */ +#define RD_KAFKA_OFFSET_FILE_FLAGMASK (O_SYNC|O_ASYNC) + + + /* For internal use. + * Use the rd_kafka_new_consumer() API instead. */ + char *topic; /* Topic to consume. */ + uint32_t partition; /* Partition to consume. */ + uint64_t offset; /* Initial offset. */ + + } consumer; + +} rd_kafka_conf_t; + + + +typedef enum { + RD_KAFKA_OP_PRODUCE, /* Application -> Kafka thread */ + RD_KAFKA_OP_FETCH, /* Kafka thread -> Application */ + RD_KAFKA_OP_ERR, /* Kafka thread -> Application */ +} rd_kafka_op_type_t; + +typedef struct rd_kafka_op_s { + TAILQ_ENTRY(rd_kafka_op_s) rko_link; + rd_kafka_op_type_t rko_type; + char *rko_topic; + uint32_t rko_partition; + int rko_flags; +#define RD_KAFKA_OP_F_FREE 0x1 /* Free the payload when done with it. */ +#define RD_KAFKA_OP_F_FREE_TOPIC 0x2 /* Free the topic when done with it. */ + /* For PRODUCE and ERR */ + char *rko_payload; + int rko_len; + /* For FETCH */ + uint64_t rko_offset; +#define rko_max_size rko_len + /* For replies */ + rd_kafka_resp_err_t rko_err; + int8_t rko_compression; + int64_t rko_offset_len; /* Length to use to advance the offset. */ +} rd_kafka_op_t; + + +typedef struct rd_kafka_q_s { + pthread_mutex_t rkq_lock; + pthread_cond_t rkq_cond; + TAILQ_HEAD(, rd_kafka_op_s) rkq_q; + int rkq_qlen; +} rd_kafka_q_t; + + + + + +/** + * Kafka handle. + */ +typedef struct rd_kafka_s { + rd_kafka_q_t rk_op; /* application -> kafka operation queue */ + rd_kafka_q_t rk_rep; /* kafka -> application reply queue */ + struct { + char name[128]; + rd_sockaddr_list_t *rsal; + int curr_addr; + int s; /* TCP socket */ + struct { + uint64_t tx_bytes; + uint64_t tx; /* Kafka-messages (not payload msgs) */ + uint64_t rx_bytes; + uint64_t rx; /* Kafka messages (not payload msgs) */ + } stats; + } rk_broker; + rd_kafka_conf_t rk_conf; + int rk_flags; + int rk_terminate; + pthread_t rk_thread; + pthread_mutex_t rk_lock; + int rk_refcnt; + rd_kafka_type_t rk_type; + rd_kafka_state_t rk_state; + struct timeval rk_tv_state_change; + union { + struct { + char *topic; + uint32_t partition; + uint64_t offset; + uint64_t app_offset; + int offset_file_fd; + } consumer; + } rk_u; +#define rk_consumer rk_u.consumer + struct { + char msg[512]; + int err; /* errno */ + } rk_err; +} rd_kafka_t; + + +/** + * Accessor functions. + * + * Locality: any thread + */ +#define rd_kafka_name(rk) ((rk)->rk_broker.name) +#define rd_kafka_state(rk) ((rk)->rk_state) + + +/** + * Destroy the Kafka handle. + * + * Locality: application thread + */ +void rd_kafka_destroy (rd_kafka_t *rk); + + +/** + * Creates a new Kafka handle and starts its operation according to the + * specified 'type'. + * + * The 'broker' argument depicts the address to the Kafka broker (sorry, + * no ZooKeeper support at this point) in the standard "[:]" format + * + * If 'broker' is NULL it defaults to "localhost:9092". + * + * If the 'broker' node name resolves to multiple addresses (and possibly + * address families) all will be used for connection attempts in + * round-robin fashion. + * + * 'conf' is an optional struct that will be copied to replace rdkafka's + * default configuration. See the 'rd_kafka_conf_t' type for more information. + * + * NOTE: Make sure SIGPIPE is either ignored or handled by the calling application. + * + * + * Returns the Kafka handle. + * + * To destroy the Kafka handle, use rd_kafka_destroy(). + * + * Locality: application thread + */ +rd_kafka_t *rd_kafka_new (rd_kafka_type_t type, const char *broker, + const rd_kafka_conf_t *conf); + +/** + * Creates a new Kafka consumer handle and sets it up for fetching messages + * from 'topic' + 'partion', beginning at 'offset'. + * + * If 'conf->consumer.offset_file' is non-NULL then the 'offset' parameter is + * ignored and the file's offset is used instead. + * + * Returns the Kafka handle. + * + * To destroy the Kafka handle, use rd_kafka_destroy(). + * + * Locality: application thread + */ +rd_kafka_t *rd_kafka_new_consumer (const char *broker, + const char *topic, + uint32_t partition, + uint64_t offset, + const rd_kafka_conf_t *conf); + +/** + * Fetches kafka messages from the internal reply queue that the kafka + * thread tries to keep populated. + * + * Will block until 'timeout_ms' expires (milliseconds, RD_POLL_NOWAIT or + * RD_POLL_INFINITE) or until a message is returned. + * + * The caller must check the reply's rko_err (RD_KAFKA_ERR_*) to distinguish + * between errors and actual data messages. + * + * Communication failure propagation: + * If rko_err is RD_KAFKA_ERR__FAIL it means a critical error has occured + * and the connection to the broker has been torn down. The application + * does not need to take any action but should log the contents of + * rko->rko_payload. + * + * Returns NULL on timeout or an 'rd_kafka_op_t *' reply on success. + * + * Locality: application thread + */ +rd_kafka_op_t *rd_kafka_consume (rd_kafka_t *rk, int timeout_ms); + +/** + * Stores the current offset in whatever storage the handle has defined. + * Must only be called by the application if RD_KAFKA_CONF_F_APP_OFFSET_STORE + * is set in conf.flags. + * + * Locality: any thread + */ +int rd_kafka_offset_store (rd_kafka_t *rk, uint64_t offset); + + + +/** + * Produce and send a single message to the broker. + * + * Locality: application thread + */ +void rd_kafka_produce (rd_kafka_t *rk, char *topic, uint32_t partition, + int msgflags, char *payload, size_t len); + +/** + * Destroys an op as returned by rd_kafka_consume(). + * + * Locality: any thread + */ +void rd_kafka_op_destroy (rd_kafka_t *rk, rd_kafka_op_t *rko); + + +/** + * Returns a human readable representation of a kafka error. + */ +const char *rd_kafka_err2str (rd_kafka_resp_err_t err); + + +/** + * Returns the current out queue length (ops waiting to be sent to the broker). + * + * Locality: any thread + */ +static inline int rd_kafka_outq_len (rd_kafka_t *rk) __attribute__((unused)); +static inline int rd_kafka_outq_len (rd_kafka_t *rk) { + return rk->rk_op.rkq_qlen; +} + + +/** + * Returns the current reply queue length (messages from the broker waiting + * for the application thread to consume). + * + * Locality: any thread + */ +static inline int rd_kafka_replyq_len (rd_kafka_t *rk) __attribute__((unused)); +static inline int rd_kafka_replyq_len (rd_kafka_t *rk) { + return rk->rk_rep.rkq_qlen; +} + + + + +/** + * The default configuration. + * When providing your own configuration to the rd_kafka_new_*() calls + * its advisable to base it on this default configuration and only + * change the relevant parts. + * I.e.: + * + * rd_kafka_conf_t myconf = rd_kafka_defaultconf; + * myconf.consumer.offset_file = "/var/kafka/offsets/"; + * rk = rd_kafka_new_consumer(, ... &myconf); + */ +extern const rd_kafka_conf_t rd_kafka_defaultconf; + + +/** + * Builtin (default) log sink: print to stderr + */ +void rd_kafka_log_print (const rd_kafka_t *rk, int level, + const char *fac, const char *buf); + + +/** + * Builtin log sink: print to syslog. + */ +void rd_kafka_log_syslog (const rd_kafka_t *rk, int level, + const char *fac, const char *buf); + + +/** + * Set logger function. + * The default is to print to stderr, but a syslog is also available, + * see rd_kafka_log_(print|syslog) for the builtin alternatives. + * Alternatively the application may provide its own logger callback. + * Or pass 'func' as NULL to disable logging. + * + * NOTE: 'rk' may be passed as NULL. + */ +void rd_kafka_set_logger (void (*func) (const rd_kafka_t *rk, int level, + const char *fac, const char *buf)); + + + +#ifdef NEED_RD_KAFKAPROTO_DEF +/* + * Kafka protocol definitions. + * This is kept as an opt-in ifdef-space to avoid name space cluttering + * for the application while still keeping the implementation to + * just two files for easy inclusion in applications in case the library + * variant is not desired. + */ + + +#define RD_KAFKA_PORT 9092 +#define RD_KAFKA_PORT_STR "9092" + +/** + * Generic Request header. + */ +struct rd_kafkap_req { + uint32_t rkpr_len; + uint16_t rkpr_type; +#define RD_KAFKAP_PRODUCE 0 +#define RD_KAFKAP_FETCH 1 +#define RD_KAFKAP_MULTIFETCH 2 +#define RD_KAFKAP_MULTIPRODUCE 3 +#define RD_KAFKAP_OFFSETS 4 + uint16_t rkpr_topic_len; + char rkpr_topic[0]; /* TOPIC and PARTITION follows */ +} RD_PACKED; + + +/** + * Generic Multi-Request header. + */ +struct rd_kafkap_multireq { + uint32_t rkpmr_len; + uint16_t rkpmr_type; + uint16_t rkpmr_topicpart_cnt; + + uint32_t rkpr_topic_len; + char rkpr_topic[0]; /* TOPIC and PARTITION follows */ +} RD_PACKED; + + +/** + * Generic Response header. + */ +struct rd_kafkap_resp { + uint32_t rkprp_len; + int16_t rkprp_error; /* rd_kafka_resp_err_t */ +} RD_PACKED; + + + +/** + * MESSAGE header + */ +struct rd_kafkap_msg { + uint32_t rkpm_len; + uint8_t rkpm_magic; +#define RD_KAFKAP_MSG_MAGIC_NO_COMPRESSION_ATTR 0 /* Not supported. */ +#define RD_KAFKAP_MSG_MAGIC_COMPRESSION_ATTR 1 + uint8_t rkpm_compression; +#define RD_KAFKAP_MSG_COMPRESSION_NONE 0 +#define RD_KAFKAP_MSG_COMPRESSION_GZIP 1 +#define RD_KAFKAP_MSG_COMPRESSION_SNAPPY 2 + uint32_t rkpm_cksum; + char rkpm_payload[0]; +} RD_PACKED; + +/** + * PRODUCE header, directly follows the request header. + */ +struct rd_kafkap_produce { + uint32_t rkpp_msgs_len; + struct rd_kafkap_msg rkpp_msgs[0]; +} RD_PACKED; + + +/** + * FETCH request header, directly follows the request header. + */ +struct rd_kafkap_fetch_req { + uint64_t rkpfr_offset; + uint32_t rkpfr_max_size; +} RD_PACKED; + +/** + * FETCH response header, directly follows the response header. + */ +struct rd_kafkap_fetch_resp { + struct rd_kafkap_msg rkpfrp_msgs[0]; +} RD_PACKED; + + + + +/** + * Helper struct containing a protocol-encoded topic+partition. + */ +struct rd_kafkap_topicpart { + int rkptp_len; + char rkptp_buf[0]; +}; + + +#endif /* NEED_KAFKAPROTO_DEF */ + diff --git a/src/sfutil/kafka/rdrand.h b/src/sfutil/kafka/rdrand.h new file mode 100644 index 0000000..eac5ef9 --- /dev/null +++ b/src/sfutil/kafka/rdrand.h @@ -0,0 +1,45 @@ +/* + * librd - Rapid Development C library + * + * Copyright (c) 2012, Magnus Edenhill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + + +/** + * Returns a random (using rand(3)) number between 'low'..'high' (inclusive). + */ +static inline int rd_jitter (int low, int high) RD_UNUSED; +static inline int rd_jitter (int low, int high) { + return (low + (rand() % (high+1))); + +} + + +/** + * Shuffles (randomizes) an array using the modern Fisher-Yates algorithm. + */ +void rd_array_shuffle (void *base, size_t nmemb, size_t entry_size); diff --git a/src/sfutil/kafka/rdtime.h b/src/sfutil/kafka/rdtime.h new file mode 100644 index 0000000..017a33a --- /dev/null +++ b/src/sfutil/kafka/rdtime.h @@ -0,0 +1,89 @@ +/* + * librd - Rapid Development C library + * + * Copyright (c) 2012, Magnus Edenhill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + + +#ifndef TIMEVAL_TO_TIMESPEC +#define TIMEVAL_TO_TIMESPEC(tv,ts) do { \ + (ts)->tv_sec = (tv)->tv_sec; \ + (ts)->tv_nsec = (tv)->tv_usec * 1000; \ + } while (0) + +#define TIMESPEC_TO_TIMEVAL(tv, ts) do { \ + (tv)->tv_sec = (ts)->tv_sec; \ + (tv)->tv_usec = (ts)->tv_nsec / 1000; \ + } while (0) +#endif + +#define TIMESPEC_TO_TS(ts) \ + (((rd_ts_t)(ts)->tv_sec * 1000000LLU) + ((ts)->tv_nsec / 1000)) + +#define TS_TO_TIMESPEC(ts,tsx) do { \ + (ts)->tv_sec = (tsx) / 1000000; \ + (ts)->tv_nsec = ((tsx) % 1000000) * 1000; \ + if ((ts)->tv_nsec > 1000000000LLU) { \ + (ts)->tv_sec++; \ + (ts)->tv_nsec -= 1000000000LLU; \ + } \ + } while (0) + +#define TIMESPEC_CLEAR(ts) ((ts)->tv_sec = (ts)->tv_nsec = 0LLU) + + +static inline rd_ts_t rd_clock (void) RD_UNUSED; +static inline rd_ts_t rd_clock (void) { +#ifdef __APPLE__ + /* No monotonic clock on Darwin */ + struct timeval tv; + gettimeofday(&tv, NULL); + TIMEVAL_TO_TIMESPEC(&tv, &ts); + return ((rd_ts_t)tv.tv_sec * 1000000LLU) + (rd_ts_t)tv.tv_usec; +#else + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return ((rd_ts_t)ts.tv_sec * 1000000LLU) + + ((rd_ts_t)ts.tv_nsec / 1000LLU); +#endif +} + + + +/** + * Thread-safe version of ctime() that strips the trailing newline. + */ +static inline const char *rd_ctime (const time_t *t) RD_UNUSED; +static inline const char *rd_ctime (const time_t *t) { + static __thread char ret[27]; + + ctime_r(t, ret); + + ret[25] = '\0'; + + return ret; +} diff --git a/src/sfutil/kafka/rdtypes.h b/src/sfutil/kafka/rdtypes.h new file mode 100644 index 0000000..ed3efc3 --- /dev/null +++ b/src/sfutil/kafka/rdtypes.h @@ -0,0 +1,47 @@ +/* + * librd - Rapid Development C library + * + * Copyright (c) 2012, Magnus Edenhill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include + + +/* + * Fundamental types + */ + + + + +typedef pthread_mutex_t rd_mutex_t; +typedef pthread_rwlock_t rd_rwlock_t; +typedef pthread_cond_t rd_cond_t; + + +/* Timestamp (microseconds) */ +typedef uint64_t rd_ts_t; diff --git a/src/sfutil/sf_kafka.c b/src/sfutil/sf_kafka.c new file mode 100644 index 0000000..eab5de2 --- /dev/null +++ b/src/sfutil/sf_kafka.c @@ -0,0 +1,276 @@ +/**************************************************************************** + * + * Copyright (C) 2003-2009 Sourcefire, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License Version 2 as + * published by the Free Software Foundation. You may not use, modify or + * distribute this program under any other version of the GNU General + * Public License. + * + * 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. + * + ****************************************************************************/ + +/** + * @file sf_kafka.c + * @author Russ Combs + * @date + * + * @brief implements buffered text stream for logging + */ + +#include +#include +#include +#include +#include + +#include "sf_kafka.h" +#include "log.h" +#include "util.h" + +/* some reasonable minimums */ +#define MIN_BUF (1*K_BYTES) +#define MIN_FILE (MIN_BUF) + + + +/*------------------------------------------------------------------- + * TextLog_Open/Close: open/close associated log file + *------------------------------------------------------------------- + */ +static rd_kafka_t* KafkaLog_Open (const char* name) +{ + if ( !name ) return NULL; + rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, name, NULL); + if(NULL == kafka_handle){ + perror("kafka_new producer"); + FatalError("There was impossible to allocate a kafka handle."); + } + return kafka_handle; +} + +static void KafkaLog_Close (rd_kafka_t* handle) +{ + if ( !handle ) return; + + /* Wait for messaging to finish. */ + while (rd_kafka_outq_len(handle) > 0) + usleep(50000); + + /* Since there is no ack for produce messages in 0.7 + * we wait some more for any packets to be sent. + * This is fixed in protocol version 0.8 */ + //if (sendcnt > 0) + usleep(500000); + + /* Destroy the handle */ + rd_kafka_destroy(handle); +} + +/* +static size_t KafkaLog_Size (rd_kafka_t* file) +{ + + struct stat sbuf; + int fd = fileno(file); + int err = fstat(fd, &sbuf); + return err ? 0 : sbuf.st_size; +} +*/ + +/*------------------------------------------------------------------- + * KafkaLog_Init: constructor + *------------------------------------------------------------------- + */ +KafkaLog* KafkaLog_Init ( + const char* broker, unsigned int maxBuf, const char * topic, const int partition +) { + KafkaLog* this; + + this = (KafkaLog*)malloc(sizeof(KafkaLog)+maxBuf); + + if ( !this ) + { + FatalError("Unable to allocate a KafkaLog(%u)!\n", maxBuf); + } + this->broker = broker ? SnortStrdup(broker) : NULL; + this->topic = topic ? SnortStrdup(topic) : NULL; + this->handler = KafkaLog_Open(this->broker); + + this->maxBuf = maxBuf; + KafkaLog_Reset(this); + + return this; +} + +/*------------------------------------------------------------------- + * KafkaLog_Term: destructor + *------------------------------------------------------------------- + */ +void KafkaLog_Term (KafkaLog* this) +{ + if ( !this ) return; + + KafkaLog_Flush(this); + KafkaLog_Close(this->handler); + + if ( this->broker ) free(this->broker); + free(this); +} + +/*------------------------------------------------------------------- + * KafkaLog_Flush: start writing to new file + * but don't roll over stdout or any sooner + * than resolution of filename discriminator + *------------------------------------------------------------------- + */ + + + +/*------------------------------------------------------------------- + * KafkaLog_Flush: write buffered stream to file + *------------------------------------------------------------------- + */ +bool KafkaLog_Flush(KafkaLog* this) +{ + + if ( !this->pos ) return FALSE; + + memcpy(this->auxbuf,this->buf,this->pos); + + rd_kafka_produce(this->handler, this->topic, 0, 0, this->auxbuf, this->pos); + + /* on stdout flush after printing to avoid lags in output */ + // if (this->file == stdout ) fflush (this->file) ; + + //if ( ok == 1 ) + //{ + KafkaLog_Reset(this); + return TRUE; + //} + //return FALSE; +} + +/*------------------------------------------------------------------- + * KafkaLog_Putc: append char to buffer + *------------------------------------------------------------------- + */ +bool KafkaLog_Putc (KafkaLog* this, char c) +{ + if ( KafkaLog_Avail(this) < 1 ) + { + KafkaLog_Flush(this); + } + this->buf[this->pos++] = c; + this->buf[this->pos] = '\0'; + + return TRUE; +} + +/*------------------------------------------------------------------- + * KafkaLog_Write: append string to buffer + *------------------------------------------------------------------- + */ +bool KafkaLog_Write (KafkaLog* this, const char* str, int len) +{ + int avail = KafkaLog_Avail(this); + + if ( len >= avail ) + { + KafkaLog_Flush(this); + avail = KafkaLog_Avail(this); + } + len = snprintf(this->buf+this->pos, avail, "%s", str); + + if ( len >= avail ) + { + this->pos = this->maxBuf - 1; + this->buf[this->pos] = '\0'; + return FALSE; + } + else if ( len < 0 ) + { + return FALSE; + } + this->pos += len; + return TRUE; +} + +/*------------------------------------------------------------------- + * KafkaLog_Printf: append formatted string to buffer + *------------------------------------------------------------------- + */ +bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) +{ + int avail = KafkaLog_Avail(this); + int len; + va_list ap; + + va_start(ap, fmt); + len = vsnprintf(this->buf+this->pos, avail, fmt, ap); + va_end(ap); + + if ( len >= avail ) + { + KafkaLog_Flush(this); + avail = KafkaLog_Avail(this); + + va_start(ap, fmt); + len = vsnprintf(this->buf+this->pos, avail, fmt, ap); + va_end(ap); + } + if ( len >= avail ) + { + this->pos = this->maxBuf - 1; + this->buf[this->pos] = '\0'; + return FALSE; + } + else if ( len < 0 ) + { + return FALSE; + } + this->pos += len; + return TRUE; +} + +/*------------------------------------------------------------------- + * KafkaLog_Quote: write string escaping quotes + * FIXTHIS could be smarter by counting required escapes instead of + * checking for 3 + *------------------------------------------------------------------- + */ +bool KafkaLog_Quote (KafkaLog* this, const char* qs) +{ + int pos = this->pos; + + if ( KafkaLog_Avail(this) < 3 ) + { + KafkaLog_Flush(this); + } + this->buf[pos++] = '"'; + + while ( *qs && (this->maxBuf - pos > 2) ) + { + if ( *qs == '"' || *qs == '\\' ) + { + this->buf[pos++] = '\\'; + } + this->buf[pos++] = *qs++; + } + if ( *qs ) return FALSE; + + this->buf[pos++] = '"'; + this->pos = pos; + + return TRUE; +} + diff --git a/src/sfutil/sf_kafka.h b/src/sfutil/sf_kafka.h new file mode 100644 index 0000000..9dfff19 --- /dev/null +++ b/src/sfutil/sf_kafka.h @@ -0,0 +1,134 @@ +/**************************************************************************** + * + * Copyright (C) 2003-2009 Sourcefire, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License Version 2 as + * published by the Free Software Foundation. You may not use, modify or + * distribute this program under any other version of the GNU General + * Public License. + * + * 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. + * + ****************************************************************************/ + +/** + * @file sf_kafka.h + * @author Russ Combs + * @date Fri Jun 27 10:34:37 2003 + * + * @brief declares buffered text stream for logging + * + * Declares a TextLog_*() api for buffered logging. This allows + * relatively painless transition from fprintf(), fwrite(), etc. + * to a buffer that is formatted in memory and written with one + * fwrite(). + * + * Additionally, the file is capped at a maximum size. Beyond + * that, the file is closed, renamed, and reopened. The current + * file always has the same name. Old files are renamed to that + * name plus a timestamp. + */ + +#ifndef _SF_KAFKA_LOG_H +#define _SF_KAFKA_LOG_H + +#include +#include +#include + +#include "debug.h" /* for INLINE */ +#include "kafka/rdkafka.h" + + +#include +#include +#include + +#include "debug.h" /* for INLINE */ + +#ifndef _SF_TEXT_LOG_H // already defined in +typedef int bool; +#define TRUE 1 +#define FALSE 0 + +#define K_BYTES (1024) +#define M_BYTES (K_BYTES*K_BYTES) +#define G_BYTES (K_BYTES*M_BYTES) +#endif + + +#define KAFKA_AUXBUF_SIZE 4096 + +/* + * DO NOT ACCESS STRUCT MEMBERS DIRECTLY + * EXCEPT FROM WITHIN THE IMPLEMENTATION! + */ +typedef struct _KafkaLog +{ +/* private: */ +/* broker attributes: */ + rd_kafka_t * handler; + char* broker; + char * topic; + int partition; + + +/* buffer attributes: */ + unsigned int pos; + unsigned int maxBuf; + char auxbuf[KAFKA_AUXBUF_SIZE]; + char buf[1]; +} KafkaLog; + +KafkaLog* KafkaLog_Init ( + const char* broker, unsigned int maxBuf, const char * topic, const int partition +); +void KafkaLog_Term (KafkaLog* this); + +bool KafkaLog_Putc(KafkaLog*, char); +bool KafkaLog_Quote(KafkaLog*, const char*); +bool KafkaLog_Write(KafkaLog*, const char*, int len); +bool KafkaLog_Print(KafkaLog*, const char* format, ...); + +bool KafkaLog_Flush(KafkaLog*); + +/*------------------------------------------------------------------- + * helper functions + *------------------------------------------------------------------- + */ + static INLINE int KafkaLog_Tell (KafkaLog* this) + { + return this->pos; + } + + static INLINE int KafkaLog_Avail (KafkaLog* this) + { + return this->maxBuf - this->pos - 1; + } + + static INLINE void KafkaLog_Reset (KafkaLog* this) + { + this->pos = 0; + this->buf[this->pos] = '\0'; + } + +static INLINE bool KafkaLog_NewLine (KafkaLog* this) +{ + return KafkaLog_Putc(this, '\n'); +} + +static INLINE bool KafkaLog_Puts (KafkaLog* this, const char* str) +{ + return KafkaLog_Write(this, str, strlen(str)); +} + +#endif /* _SF_KAFKA_LOG_H */ + From c408120edbafc6784e62e9061c68082c7df634c3 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 16 Apr 2013 15:52:39 +0000 Subject: [PATCH 009/198] Kafka topic can be specified adding a '@' after broker's name modified: output-plugins/spo_alert_json.c --- src/output-plugins/spo_alert_json.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 59aefaf..4bca057 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -260,7 +260,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) switch (i) { case 0: - if ( !strncasecmp(tok, "stdout",strlen("stdout")) || !strncasecmp(tok, "kafka://",strlen("kafka://"))) + if ( !strncasecmp(tok, "stdout",strlen("stdout")) || !strncasecmp(tok, KAFKA_PROT,strlen(KAFKA_PROT))) filename = SnortStrdup(tok); else @@ -314,12 +314,23 @@ static AlertJSONData *AlertJSONParseArgs(char *args) DEBUG_INIT, "alert_json: '%s' '%s' %ld\n", filename, data->jsonargs, limit );); - const bool notfile = !strncasecmp(filename,"kafka://",strlen("kafka://")); + const bool notfile = !strncasecmp(filename,KAFKA_PROT,strlen(KAFKA_PROT)); const bool stdout = notfile && !strncasecmp(filename,"stdout",strlen("stdout")); - const char * kafka_server = stdout?filename+strlen("stdout+") : filename; // must start with kafka:// + const char * kafka_str = stdout?filename+strlen("stdout+") : filename; // must start with kafka:// - if(!strncasecmp(kafka_server,"kafka://",strlen("kafka://"))) - data->kafka = KafkaLog_Init(kafka_server+strlen("kafka://"),LOG_BUFFER, KAFKA_TOPIC,KAFKA_PARTITION); + + if(!strncasecmp(kafka_str,KAFKA_PROT,strlen(KAFKA_PROT))){ + const char * at_char_pos = strchr(kafka_str,'@'); + if(at_char_pos==NULL) + FatalError("alert_json: No topic specified, despite the fact a kafka server was given. Use kafka://broker@topic."); + const size_t broker_length = (at_char_pos-(kafka_str+strlen(KAFKA_PROT))); + char * kafka_server = malloc(sizeof(char)*(broker_length+1)); + strncpy(kafka_server,kafka_str+strlen(KAFKA_PROT),broker_length); + + data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char_pos+1,KAFKA_PARTITION); + + } + if(!notfile) data->log = TextLog_Init(stdout?"stdout":filename, LOG_BUFFER, limit); @@ -729,7 +740,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(p->tcph){ LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); // PrintJSONFieldName(log,kafka,JSON_TCPSEQ_NAME); // hex format - // LogOrKafka_Print_M(log, kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); // hex format + // LogOrKafka_Print_M(log, kafka, "lX%0x",(u_long) ntohl(p->tcph->th_ack)); // hex format LogJSON_i32(log,kafka,JSON_TCPSEQ_NAME,ntohl(p->tcph->th_seq)); } } From 5d886ca9f6f694e32da547c3b6ea96210b652cd6 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 16 Apr 2013 17:03:00 +0000 Subject: [PATCH 010/198] FIX: alert_json can send alerts to a file and a kafka broker at the same time now modified: output-plugins/spo_alert_json.c --- src/output-plugins/spo_alert_json.c | 92 +++++++++++++---------------- 1 file changed, 41 insertions(+), 51 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 4bca057..28682cb 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -78,9 +78,10 @@ #define LOG_BUFFER (4*K_BYTES) #define KAFKA_PROT "kafka://" -#define KAFKA_TOPIC "redBorderIPS" //#define KAFKA_TOPIC "rb_ips" #define KAFKA_PARTITION 0 +#define FILENAME_KAFKA_SEPARATOR '+' +#define BROKER_TOPIC_SEPARATOR '@' #define FIELD_NAME_VALUE_SEPARATOR ": " #define JSON_FIELDS_SEPARATOR ", " @@ -97,7 +98,7 @@ #define JSON_UDPLENGTH_NAME "udplength" #define JSON_ETHLENGTH_NAME "ethlength" #define JSON_TRHEADER_NAME "trheader" -#define JSON_SRCPORT_NAME "secport" +#define JSON_SRCPORT_NAME "srcport" #define JSON_DSTPORT_NAME "dstport" #define JSON_SRC_NAME "src" #define JSON_DST_NAME "dst" @@ -314,13 +315,18 @@ static AlertJSONData *AlertJSONParseArgs(char *args) DEBUG_INIT, "alert_json: '%s' '%s' %ld\n", filename, data->jsonargs, limit );); - const bool notfile = !strncasecmp(filename,KAFKA_PROT,strlen(KAFKA_PROT)); - const bool stdout = notfile && !strncasecmp(filename,"stdout",strlen("stdout")); - const char * kafka_str = stdout?filename+strlen("stdout+") : filename; // must start with kafka:// + char * kafka_str = 0==strncasecmp(filename,KAFKA_PROT,strlen(KAFKA_PROT)) ? filename : NULL; + if(!kafka_str) + if((kafka_str = strchr(filename,FILENAME_KAFKA_SEPARATOR))){ + *kafka_str = '\0'; // filename now ends here. + kafka_str++; // skip the '+' + } + + - if(!strncasecmp(kafka_str,KAFKA_PROT,strlen(KAFKA_PROT))){ - const char * at_char_pos = strchr(kafka_str,'@'); + if(kafka_str){ + const char * at_char_pos = strchr(kafka_str,BROKER_TOPIC_SEPARATOR); if(at_char_pos==NULL) FatalError("alert_json: No topic specified, despite the fact a kafka server was given. Use kafka://broker@topic."); const size_t broker_length = (at_char_pos-(kafka_str+strlen(KAFKA_PROT))); @@ -332,8 +338,8 @@ static AlertJSONData *AlertJSONParseArgs(char *args) } - if(!notfile) - data->log = TextLog_Init(stdout?"stdout":filename, LOG_BUFFER, limit); + if(strncasecmp(filename,KAFKA_PROT,strlen(KAFKA_PROT))!=0) + data->log = TextLog_Init(filename, LOG_BUFFER, limit); if ( filename ) free(filename); @@ -376,54 +382,34 @@ static void AlertJSON(Packet *p, void *event, uint32_t event_type, void *arg) RealAlertJSON(p, event, event_type, data->args, data->numargs, data->log,data->kafka); } -static bool PrintJSONFieldName(TextLog * log,KafkaLog * kafka,const char *fieldName){ - bool aok = LogOrKafka_Quote(log,kafka,fieldName); - - if(aok){ - LogOrKafka_Puts(log,kafka,FIELD_NAME_VALUE_SEPARATOR); - } - return aok; +static bool inline PrintJSONFieldName(TextLog * log,KafkaLog * kafka,const char *fieldName){ + return LogOrKafka_Quote(log,kafka,fieldName) && LogOrKafka_Puts(log,kafka,FIELD_NAME_VALUE_SEPARATOR); } -static bool LogJSON_i64(TextLog *log,KafkaLog * kafka,const char *fieldName,uint64_t fieldValue){ +static bool inline LogJSON_int(TextLog *log,KafkaLog * kafka, const char * fieldName,uint64_t fieldValue,char * fmt){ bool aok = PrintJSONFieldName(log,kafka,fieldName); - if(aok){ - if(log) - TextLog_Print(log,"%"PRIu64,fieldValue); - if(kafka) - KafkaLog_Print(kafka,"%"PRIu64,fieldValue); - } + if(aok) + aok = (log?TextLog_Print(log,fmt,fieldValue):1) && (kafka?KafkaLog_Print(kafka,fmt,fieldValue):1); return aok; } -static bool LogJSON_i32(TextLog *log,KafkaLog * kafka,const char *fieldName,uint32_t fieldValue){ - bool aok = PrintJSONFieldName(log,kafka,fieldName); - if(aok){ - if(log) - TextLog_Print(log,"%"PRIu32,fieldValue); - if(kafka) - KafkaLog_Print(kafka,"%"PRIu32,fieldValue); - } - return aok; +static bool inline LogJSON_i64(TextLog *log,KafkaLog * kafka,const char *fieldName,uint64_t fieldValue){ + return LogJSON_int(log,kafka,fieldName,fieldValue,"%"PRIu64); } -static bool LogJSON_i16(TextLog *log,KafkaLog * kafka,const char *fieldName,uint16_t fieldValue){ - bool aok = PrintJSONFieldName(log,kafka,fieldName); - if(aok){ - if(log) - TextLog_Print(log,"%"PRIu16,fieldValue); - if(kafka) - KafkaLog_Print(kafka,"%"PRIu16,fieldValue); - } - return aok; +static bool inline LogJSON_i32(TextLog *log,KafkaLog * kafka,const char *fieldName,uint32_t fieldValue){ + return LogJSON_int(log,kafka,fieldName,fieldValue,"%"PRIu32); +} + +static bool inline LogJSON_i16(TextLog *log,KafkaLog * kafka,const char *fieldName,uint16_t fieldValue){ + return LogJSON_int(log,kafka,fieldName,fieldValue,"%"PRIu16); } -static bool LogJSON_a(TextLog *log,KafkaLog *kafka,const char *fieldName,const char *fieldValue){ +static bool inline LogJSON_a(TextLog *log,KafkaLog *kafka,const char *fieldName,const char *fieldValue){ bool aok = 1; - if(aok && log) - aok= PrintJSONFieldName(log,kafka,fieldName) && TextLog_Quote(log,fieldValue); - if(aok && kafka) - aok = PrintJSONFieldName(log,kafka,fieldName) && KafkaLog_Quote(kafka,fieldValue); + if(aok) aok = LogOrKafka_Quote(log,kafka,fieldName); + if(aok) aok = LogOrKafka_Puts(log,kafka,FIELD_NAME_VALUE_SEPARATOR); + if(aok) aok = LogOrKafka_Quote(log,kafka,fieldValue); return aok; } @@ -651,7 +637,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, PrintJSONFieldName(log,kafka,JSON_DST_NAME); LogOrKafka_Puts(log,kafka, inet_ntoa(GET_DST_ADDR(p))); */ - LogJSON_i32(log,kafka,JSON_SRC_NAME,ntohl(GET_SRC_ADDR(p).s_addr)); + LogJSON_i32(log,kafka,JSON_DST_NAME,ntohl(GET_DST_ADDR(p).s_addr)); } } else if(!strncasecmp("icmptype",type,8)) @@ -711,12 +697,15 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(IPH_IS_VALID(p)){ LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_ID_NAME); + /* + PrintJSONFieldName(log,kafka,JSON_ID_NAME); if(log) TextLog_Print(log, "%u", IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); - else + if(kafka) KafkaLog_Print(kafka,"%u", IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); - } + */ + LogJSON_i16(log,kafka,JSON_ID_NAME,IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); + } } else if(!strncasecmp("iplen",type,5)) { @@ -789,7 +778,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, TextLog_Putc(log,'}'); TextLog_NewLine(log); TextLog_Flush(log); - }else{ + } + if(kafka){ KafkaLog_Putc(kafka,'}'); //KafkaLog_NewLine(kafka); // Newline not needed. KafkaLog_Flush(kafka); From 6d7624037e5dc4b6adf0319af2a8bc2a90cc59f2 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 18 Apr 2013 08:30:41 +0000 Subject: [PATCH 011/198] Delayed KafkaLog's handler init in daemon mode (Need to do because a fork() in that mode). modified: src/output-plugins/spo_alert_json.c modified: src/sfutil/sf_kafka.c modified: src/sfutil/sf_kafka.h --- src/output-plugins/spo_alert_json.c | 13 +++++++++---- src/sfutil/sf_kafka.c | 14 +++++++++++--- src/sfutil/sf_kafka.h | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 28682cb..3a0f1a2 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -114,6 +114,7 @@ #define JSON_TCPSEQ_NAME "tcpseq" #define JSON_TCPACK_NAME "tcpack" #define JSON_TCPLEN_NAME "tcplen" +#define JSON_TCPWINDOW_NAME "tcpwindow" #define JSON_TCPFLAGS_NAME "tcpflags" @@ -333,8 +334,12 @@ static AlertJSONData *AlertJSONParseArgs(char *args) char * kafka_server = malloc(sizeof(char)*(broker_length+1)); strncpy(kafka_server,kafka_str+strlen(KAFKA_PROT),broker_length); - data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char_pos+1,KAFKA_PARTITION); + /* + * In DaemonMode(), kafka must start in another function, because, in daemon mode, Barnyard2Main will execute this + * function, will do a fork() and then, in the child process, will call RealAlertJSON, that will not be able to + * send kafka data*/ + data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char_pos+1,KAFKA_PARTITION,BcDaemonMode()?0:1); } @@ -739,7 +744,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); // PrintJSONFieldName(log,kafka,JSON_TCPACK_NAME); // LogOrKafka_Print_M(log, kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); - LogJSON_i32(log,kafka,JSON_TCPSEQ_NAME,ntohl(p->tcph->th_ack)); + LogJSON_i32(log,kafka,JSON_TCPACK_NAME,ntohl(p->tcph->th_ack)); } } @@ -755,9 +760,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(p->tcph){ LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - //PrintJSONFieldName(log,kafka,JSON_DST_NAME); // hex format + //PrintJSONFieldName(log,kafka,JSON_TCPWINDOW_NAME); // hex format //LogOrKafka_Print_M(log, kafka, "0x%X",ntohs(p->tcph->th_win)); // hex format - LogJSON_i16(log,kafka,JSON_TCPSEQ_NAME,ntohs(p->tcph->th_win)); + LogJSON_i16(log,kafka,JSON_TCPWINDOW_NAME,ntohs(p->tcph->th_win)); } } else if(!strncasecmp("tcpflags",type,8)) diff --git a/src/sfutil/sf_kafka.c b/src/sfutil/sf_kafka.c index eab5de2..6ed6c23 100644 --- a/src/sfutil/sf_kafka.c +++ b/src/sfutil/sf_kafka.c @@ -37,6 +37,8 @@ #include "log.h" #include "util.h" +#include "barnyard2.h" + /* some reasonable minimums */ #define MIN_BUF (1*K_BYTES) #define MIN_FILE (MIN_BUF) @@ -47,7 +49,7 @@ * TextLog_Open/Close: open/close associated log file *------------------------------------------------------------------- */ -static rd_kafka_t* KafkaLog_Open (const char* name) +rd_kafka_t* KafkaLog_Open (const char* name) { if ( !name ) return NULL; rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, name, NULL); @@ -89,10 +91,12 @@ static size_t KafkaLog_Size (rd_kafka_t* file) /*------------------------------------------------------------------- * KafkaLog_Init: constructor + * If open=1, will create kafka handler. If not, KafkaLog->handler returned from this function + * will be null *------------------------------------------------------------------- */ KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int maxBuf, const char * topic, const int partition + const char* broker, unsigned int maxBuf, const char * topic, const int partition, bool open ) { KafkaLog* this; @@ -104,7 +108,7 @@ KafkaLog* KafkaLog_Init ( } this->broker = broker ? SnortStrdup(broker) : NULL; this->topic = topic ? SnortStrdup(topic) : NULL; - this->handler = KafkaLog_Open(this->broker); + this->handler = open ? KafkaLog_Open(this->broker):NULL; this->maxBuf = maxBuf; KafkaLog_Reset(this); @@ -147,6 +151,10 @@ bool KafkaLog_Flush(KafkaLog* this) memcpy(this->auxbuf,this->buf,this->pos); + // In daemon mode, we must start the handler here + if(this->handler==NULL && BcDaemonMode()){ + this->handler = KafkaLog_Open(this->broker); + } rd_kafka_produce(this->handler, this->topic, 0, 0, this->auxbuf, this->pos); /* on stdout flush after printing to avoid lags in output */ diff --git a/src/sfutil/sf_kafka.h b/src/sfutil/sf_kafka.h index 9dfff19..ece766b 100644 --- a/src/sfutil/sf_kafka.h +++ b/src/sfutil/sf_kafka.h @@ -89,7 +89,7 @@ typedef struct _KafkaLog } KafkaLog; KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int maxBuf, const char * topic, const int partition + const char* broker, unsigned int maxBuf, const char * topic, const int partition, bool open ); void KafkaLog_Term (KafkaLog* this); From 615879cb20df4040d97684741849998ca828db08 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 18 Apr 2013 11:21:01 +0000 Subject: [PATCH 012/198] Increased spo_alert_json LOG_BUFFER; Kafka split messages with just 4K modified: src/output-plugins/spo_alert_json.c --- src/output-plugins/spo_alert_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 3a0f1a2..c5fa1fb 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -75,7 +75,7 @@ #define DEFAULT_FILE "alert.json" #define DEFAULT_LIMIT (128*M_BYTES) -#define LOG_BUFFER (4*K_BYTES) +#define LOG_BUFFER (30*K_BYTES) #define KAFKA_PROT "kafka://" //#define KAFKA_TOPIC "rb_ips" From 43a2c43a99e4ad24f97e4e785d9b3eafdad42869 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 May 2013 12:15:17 +0000 Subject: [PATCH 013/198] Changed the way sf_kafka use the buffer. Now it allocate a new one and let librdkafka free it. deleted: src/output-plugins/kafka/librdkafka.a deleted: src/output-plugins/kafka/rdkafka.h modified: src/sfutil/sf_kafka.c modified: src/sfutil/sf_kafka.h --- src/output-plugins/kafka/librdkafka.a | Bin 139260 -> 0 bytes src/output-plugins/kafka/rdkafka.h | 520 -------------------------- src/sfutil/sf_kafka.c | 21 +- src/sfutil/sf_kafka.h | 2 +- 4 files changed, 8 insertions(+), 535 deletions(-) delete mode 100644 src/output-plugins/kafka/librdkafka.a delete mode 100644 src/output-plugins/kafka/rdkafka.h diff --git a/src/output-plugins/kafka/librdkafka.a b/src/output-plugins/kafka/librdkafka.a deleted file mode 100644 index 4825afe3f70982284280acff115d9fe95216fbf0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139260 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 -#include -#include -#include - -#ifndef WITH_LIBRD - -#include "rd.h" -#include "rdaddr.h" - -#define RD_POLL_INFINITE -1 -#define RD_POLL_NOWAIT 0 - -#else - -#include -#include -#endif - -#define RD_KAFKA_TOPIC_MAXLEN 256 - -typedef enum { - RD_KAFKA_PRODUCER, - RD_KAFKA_CONSUMER, -} rd_kafka_type_t; - -typedef enum { - RD_KAFKA_STATE_DOWN, - RD_KAFKA_STATE_CONNECTING, - RD_KAFKA_STATE_UP, -} rd_kafka_state_t; - - -typedef enum { - /* Internal errors to rdkafka: */ - RD_KAFKA_RESP_ERR__BAD_MSG = -199, - RD_KAFKA_RESP_ERR__BAD_COMPRESSION = -198, - RD_KAFKA_RESP_ERR__FAIL = -197, /* See rko_payload for error string */ - /* Standard Kafka errors: */ - RD_KAFKA_RESP_ERR_UNKNOWN = -1, - RD_KAFKA_RESP_ERR_NO_ERROR = 0, - RD_KAFKA_RESP_ERR_OFFSET_OUT_OF_RANGE = 1, - RD_KAFKA_RESP_ERR_INVALID_MSG = 2, - RD_KAFKA_RESP_ERR_WRONG_PARTITION = 3, - RD_KAFKA_RESP_ERR_INVALID_FETCH_SIZE = 4, -} rd_kafka_resp_err_t; - - -/** - * Optional configuration struct passed to rd_kafka_new*(). - * See head of rdkafka.c for defaults. - * See comment below for rd_kafka_defaultconf use. - */ -typedef struct rd_kafka_conf_s { - int max_msg_size; /* Maximum receive message size. - * This is a safety precaution to - * avoid memory exhaustion in case of - * protocol hickups. */ - - int flags; -#define RD_KAFKA_CONF_F_APP_OFFSET_STORE 0x1 /* No automatic offset storage - * will be performed. The - * application needs to - * call rd_kafka_offset_store() - * explicitly. - * This may be used to make sure - * a message is properly handled - * before storing the offset. - * If not set, and an offset - * storage is available, the - * offset will be stored - * just prior to passing the - * message to the application.*/ - - struct { - int poll_interval; /* Time in milliseconds to sleep before - * trying to FETCH again if the broker - * did not return any messages for - * the last FETCH call. - * I.e.: idle poll interval. */ - - int replyq_low_thres; /* The low water threshold for the - * reply queue. - * I.e.: how many messages we'll try - * to keep in the reply queue at any - * given time. - * The reply queue is the queue of - * read messages from the broker - * that are still to be passed to - * the application. */ - - uint32_t max_size; /* The maximum size to be returned - * by FETCH. */ - - char *offset_file; /* File to read/store current - * offset from/in. - * If the path is a directory then a - * filename is generated (including - * the topic and partition) and - * appended. */ - int offset_file_flags; /* open(2) flags. */ -#define RD_KAFKA_OFFSET_FILE_FLAGMASK (O_SYNC|O_ASYNC) - - - /* For internal use. - * Use the rd_kafka_new_consumer() API instead. */ - char *topic; /* Topic to consume. */ - uint32_t partition; /* Partition to consume. */ - uint64_t offset; /* Initial offset. */ - - } consumer; - -} rd_kafka_conf_t; - - - -typedef enum { - RD_KAFKA_OP_PRODUCE, /* Application -> Kafka thread */ - RD_KAFKA_OP_FETCH, /* Kafka thread -> Application */ - RD_KAFKA_OP_ERR, /* Kafka thread -> Application */ -} rd_kafka_op_type_t; - -typedef struct rd_kafka_op_s { - TAILQ_ENTRY(rd_kafka_op_s) rko_link; - rd_kafka_op_type_t rko_type; - char *rko_topic; - uint32_t rko_partition; - int rko_flags; -#define RD_KAFKA_OP_F_FREE 0x1 /* Free the payload when done with it. */ -#define RD_KAFKA_OP_F_FREE_TOPIC 0x2 /* Free the topic when done with it. */ - /* For PRODUCE and ERR */ - char *rko_payload; - int rko_len; - /* For FETCH */ - uint64_t rko_offset; -#define rko_max_size rko_len - /* For replies */ - rd_kafka_resp_err_t rko_err; - int8_t rko_compression; - int64_t rko_offset_len; /* Length to use to advance the offset. */ -} rd_kafka_op_t; - - -typedef struct rd_kafka_q_s { - pthread_mutex_t rkq_lock; - pthread_cond_t rkq_cond; - TAILQ_HEAD(, rd_kafka_op_s) rkq_q; - int rkq_qlen; -} rd_kafka_q_t; - - - - - -/** - * Kafka handle. - */ -typedef struct rd_kafka_s { - rd_kafka_q_t rk_op; /* application -> kafka operation queue */ - rd_kafka_q_t rk_rep; /* kafka -> application reply queue */ - struct { - char name[128]; - rd_sockaddr_list_t *rsal; - int curr_addr; - int s; /* TCP socket */ - struct { - uint64_t tx_bytes; - uint64_t tx; /* Kafka-messages (not payload msgs) */ - uint64_t rx_bytes; - uint64_t rx; /* Kafka messages (not payload msgs) */ - } stats; - } rk_broker; - rd_kafka_conf_t rk_conf; - int rk_flags; - int rk_terminate; - pthread_t rk_thread; - pthread_mutex_t rk_lock; - int rk_refcnt; - rd_kafka_type_t rk_type; - rd_kafka_state_t rk_state; - struct timeval rk_tv_state_change; - union { - struct { - char *topic; - uint32_t partition; - uint64_t offset; - uint64_t app_offset; - int offset_file_fd; - } consumer; - } rk_u; -#define rk_consumer rk_u.consumer - struct { - char msg[512]; - int err; /* errno */ - } rk_err; -} rd_kafka_t; - - -/** - * Accessor functions. - * - * Locality: any thread - */ -#define rd_kafka_name(rk) ((rk)->rk_broker.name) -#define rd_kafka_state(rk) ((rk)->rk_state) - - -/** - * Destroy the Kafka handle. - * - * Locality: application thread - */ -void rd_kafka_destroy (rd_kafka_t *rk); - - -/** - * Creates a new Kafka handle and starts its operation according to the - * specified 'type'. - * - * The 'broker' argument depicts the address to the Kafka broker (sorry, - * no ZooKeeper support at this point) in the standard "[:]" format - * - * If 'broker' is NULL it defaults to "localhost:9092". - * - * If the 'broker' node name resolves to multiple addresses (and possibly - * address families) all will be used for connection attempts in - * round-robin fashion. - * - * 'conf' is an optional struct that will be copied to replace rdkafka's - * default configuration. See the 'rd_kafka_conf_t' type for more information. - * - * NOTE: Make sure SIGPIPE is either ignored or handled by the calling application. - * - * - * Returns the Kafka handle. - * - * To destroy the Kafka handle, use rd_kafka_destroy(). - * - * Locality: application thread - */ -rd_kafka_t *rd_kafka_new (rd_kafka_type_t type, const char *broker, - const rd_kafka_conf_t *conf); - -/** - * Creates a new Kafka consumer handle and sets it up for fetching messages - * from 'topic' + 'partion', beginning at 'offset'. - * - * If 'conf->consumer.offset_file' is non-NULL then the 'offset' parameter is - * ignored and the file's offset is used instead. - * - * Returns the Kafka handle. - * - * To destroy the Kafka handle, use rd_kafka_destroy(). - * - * Locality: application thread - */ -rd_kafka_t *rd_kafka_new_consumer (const char *broker, - const char *topic, - uint32_t partition, - uint64_t offset, - const rd_kafka_conf_t *conf); - -/** - * Fetches kafka messages from the internal reply queue that the kafka - * thread tries to keep populated. - * - * Will block until 'timeout_ms' expires (milliseconds, RD_POLL_NOWAIT or - * RD_POLL_INFINITE) or until a message is returned. - * - * The caller must check the reply's rko_err (RD_KAFKA_ERR_*) to distinguish - * between errors and actual data messages. - * - * Communication failure propagation: - * If rko_err is RD_KAFKA_ERR__FAIL it means a critical error has occured - * and the connection to the broker has been torn down. The application - * does not need to take any action but should log the contents of - * rko->rko_payload. - * - * Returns NULL on timeout or an 'rd_kafka_op_t *' reply on success. - * - * Locality: application thread - */ -rd_kafka_op_t *rd_kafka_consume (rd_kafka_t *rk, int timeout_ms); - -/** - * Stores the current offset in whatever storage the handle has defined. - * Must only be called by the application if RD_KAFKA_CONF_F_APP_OFFSET_STORE - * is set in conf.flags. - * - * Locality: any thread - */ -int rd_kafka_offset_store (rd_kafka_t *rk, uint64_t offset); - - - -/** - * Produce and send a single message to the broker. - * - * Locality: application thread - */ -void rd_kafka_produce (rd_kafka_t *rk, char *topic, uint32_t partition, - int msgflags, char *payload, size_t len); - -/** - * Destroys an op as returned by rd_kafka_consume(). - * - * Locality: any thread - */ -void rd_kafka_op_destroy (rd_kafka_t *rk, rd_kafka_op_t *rko); - - -/** - * Returns a human readable representation of a kafka error. - */ -const char *rd_kafka_err2str (rd_kafka_resp_err_t err); - - -/** - * Returns the current out queue length (ops waiting to be sent to the broker). - * - * Locality: any thread - */ -static inline int rd_kafka_outq_len (rd_kafka_t *rk) __attribute__((unused)); -static inline int rd_kafka_outq_len (rd_kafka_t *rk) { - return rk->rk_op.rkq_qlen; -} - - -/** - * Returns the current reply queue length (messages from the broker waiting - * for the application thread to consume). - * - * Locality: any thread - */ -static inline int rd_kafka_replyq_len (rd_kafka_t *rk) __attribute__((unused)); -static inline int rd_kafka_replyq_len (rd_kafka_t *rk) { - return rk->rk_rep.rkq_qlen; -} - - - - -/** - * The default configuration. - * When providing your own configuration to the rd_kafka_new_*() calls - * its advisable to base it on this default configuration and only - * change the relevant parts. - * I.e.: - * - * rd_kafka_conf_t myconf = rd_kafka_defaultconf; - * myconf.consumer.offset_file = "/var/kafka/offsets/"; - * rk = rd_kafka_new_consumer(, ... &myconf); - */ -extern const rd_kafka_conf_t rd_kafka_defaultconf; - - -/** - * Builtin (default) log sink: print to stderr - */ -void rd_kafka_log_print (const rd_kafka_t *rk, int level, - const char *fac, const char *buf); - - -/** - * Builtin log sink: print to syslog. - */ -void rd_kafka_log_syslog (const rd_kafka_t *rk, int level, - const char *fac, const char *buf); - - -/** - * Set logger function. - * The default is to print to stderr, but a syslog is also available, - * see rd_kafka_log_(print|syslog) for the builtin alternatives. - * Alternatively the application may provide its own logger callback. - * Or pass 'func' as NULL to disable logging. - * - * NOTE: 'rk' may be passed as NULL. - */ -void rd_kafka_set_logger (void (*func) (const rd_kafka_t *rk, int level, - const char *fac, const char *buf)); - - - -#ifdef NEED_RD_KAFKAPROTO_DEF -/* - * Kafka protocol definitions. - * This is kept as an opt-in ifdef-space to avoid name space cluttering - * for the application while still keeping the implementation to - * just two files for easy inclusion in applications in case the library - * variant is not desired. - */ - - -#define RD_KAFKA_PORT 9092 -#define RD_KAFKA_PORT_STR "9092" - -/** - * Generic Request header. - */ -struct rd_kafkap_req { - uint32_t rkpr_len; - uint16_t rkpr_type; -#define RD_KAFKAP_PRODUCE 0 -#define RD_KAFKAP_FETCH 1 -#define RD_KAFKAP_MULTIFETCH 2 -#define RD_KAFKAP_MULTIPRODUCE 3 -#define RD_KAFKAP_OFFSETS 4 - uint16_t rkpr_topic_len; - char rkpr_topic[0]; /* TOPIC and PARTITION follows */ -} RD_PACKED; - - -/** - * Generic Multi-Request header. - */ -struct rd_kafkap_multireq { - uint32_t rkpmr_len; - uint16_t rkpmr_type; - uint16_t rkpmr_topicpart_cnt; - - uint32_t rkpr_topic_len; - char rkpr_topic[0]; /* TOPIC and PARTITION follows */ -} RD_PACKED; - - -/** - * Generic Response header. - */ -struct rd_kafkap_resp { - uint32_t rkprp_len; - int16_t rkprp_error; /* rd_kafka_resp_err_t */ -} RD_PACKED; - - - -/** - * MESSAGE header - */ -struct rd_kafkap_msg { - uint32_t rkpm_len; - uint8_t rkpm_magic; -#define RD_KAFKAP_MSG_MAGIC_NO_COMPRESSION_ATTR 0 /* Not supported. */ -#define RD_KAFKAP_MSG_MAGIC_COMPRESSION_ATTR 1 - uint8_t rkpm_compression; -#define RD_KAFKAP_MSG_COMPRESSION_NONE 0 -#define RD_KAFKAP_MSG_COMPRESSION_GZIP 1 -#define RD_KAFKAP_MSG_COMPRESSION_SNAPPY 2 - uint32_t rkpm_cksum; - char rkpm_payload[0]; -} RD_PACKED; - -/** - * PRODUCE header, directly follows the request header. - */ -struct rd_kafkap_produce { - uint32_t rkpp_msgs_len; - struct rd_kafkap_msg rkpp_msgs[0]; -} RD_PACKED; - - -/** - * FETCH request header, directly follows the request header. - */ -struct rd_kafkap_fetch_req { - uint64_t rkpfr_offset; - uint32_t rkpfr_max_size; -} RD_PACKED; - -/** - * FETCH response header, directly follows the response header. - */ -struct rd_kafkap_fetch_resp { - struct rd_kafkap_msg rkpfrp_msgs[0]; -} RD_PACKED; - - - - -/** - * Helper struct containing a protocol-encoded topic+partition. - */ -struct rd_kafkap_topicpart { - int rkptp_len; - char rkptp_buf[0]; -}; - - -#endif /* NEED_KAFKAPROTO_DEF */ - diff --git a/src/sfutil/sf_kafka.c b/src/sfutil/sf_kafka.c index 6ed6c23..99866cb 100644 --- a/src/sfutil/sf_kafka.c +++ b/src/sfutil/sf_kafka.c @@ -100,9 +100,10 @@ KafkaLog* KafkaLog_Init ( ) { KafkaLog* this; - this = (KafkaLog*)malloc(sizeof(KafkaLog)+maxBuf); + this = (KafkaLog*)malloc(sizeof(KafkaLog)); + this->buf = malloc(sizeof(char)*maxBuf); - if ( !this ) + if ( !this || !this->buf) { FatalError("Unable to allocate a KafkaLog(%u)!\n", maxBuf); } @@ -149,23 +150,15 @@ bool KafkaLog_Flush(KafkaLog* this) if ( !this->pos ) return FALSE; - memcpy(this->auxbuf,this->buf,this->pos); - // In daemon mode, we must start the handler here if(this->handler==NULL && BcDaemonMode()){ this->handler = KafkaLog_Open(this->broker); } - rd_kafka_produce(this->handler, this->topic, 0, 0, this->auxbuf, this->pos); - - /* on stdout flush after printing to avoid lags in output */ - // if (this->file == stdout ) fflush (this->file) ; + rd_kafka_produce(this->handler, this->topic, 0, RD_KAFKA_OP_F_FREE, this->buf, this->pos); + this->buf = malloc(sizeof(char)*this->maxBuf); - //if ( ok == 1 ) - //{ - KafkaLog_Reset(this); - return TRUE; - //} - //return FALSE; + KafkaLog_Reset(this); + return TRUE; } /*------------------------------------------------------------------- diff --git a/src/sfutil/sf_kafka.h b/src/sfutil/sf_kafka.h index ece766b..46463f8 100644 --- a/src/sfutil/sf_kafka.h +++ b/src/sfutil/sf_kafka.h @@ -85,7 +85,7 @@ typedef struct _KafkaLog unsigned int pos; unsigned int maxBuf; char auxbuf[KAFKA_AUXBUF_SIZE]; - char buf[1]; + char * buf; } KafkaLog; KafkaLog* KafkaLog_Init ( From b1f4acc17ac29b4b70225a0dd5e3efc5eabc599b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 May 2013 12:22:49 +0000 Subject: [PATCH 014/198] FIX: When sending alerts, sometimes proto was not set, so the json alert contained a blank space in arguments, surrounded by commas (", ,"). Now, if the alert's proto is not valid, we don't send the comma. modified: src/output-plugins/spo_alert_json.c --- etc/barnyard2.conf | 4 ++++ src/output-plugins/spo_alert_json.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/etc/barnyard2.conf b/etc/barnyard2.conf index 986963f..24e9b4f 100644 --- a/etc/barnyard2.conf +++ b/etc/barnyard2.conf @@ -362,3 +362,7 @@ output alert_fast: stdout # output alert_fwsam: 192.168.0.1/borderfw 192.168.1.254/wanfw # +#output alert_json: alert.json +output alert_json: kafka://192.168.101.203:9092@RedBorderIPS +#output alert_json: stdout +#output alert_json: alert.json diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index c5fa1fb..06fb998 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -515,19 +515,21 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(IPH_IS_VALID(p)) { - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); switch (GET_IPH_PROTO(p)) { case IPPROTO_UDP: //TextLog_Puts(log, "UDP"); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(log,kafka,JSON_PROTO_NAME,"UDP"); break; case IPPROTO_TCP: //TextLog_Puts(log, "TCP"); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(log,kafka,JSON_PROTO_NAME,"TCP"); break; case IPPROTO_ICMP: //TextLog_Puts(log, "ICMP"); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(log,kafka,JSON_PROTO_NAME,"ICMP"); break; } @@ -775,7 +777,6 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogOrKafka_Quote(log, kafka, tcpFlags); } } - DEBUG_WRAP(DebugMessage(DEBUG_LOG, "WOOT!\n");); } From de53c97f131d7c3a1c30218ec9b559a9bbf5be1e Mon Sep 17 00:00:00 2001 From: Eric Lauzon Date: Wed, 13 Mar 2013 09:20:38 -0400 Subject: [PATCH 015/198] Bumped: version to 2-1.13-BETA Bumped: build to 325 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add: Full support for sid-msg v2 format which enchanced by the following fields: gid,revision,classification,priority for each entry which allow pre-population of signature metadata by barnyard2 if database output is used. Add: Signature Suppression support at the spooler level using configuration directive. See doc/README.sig_suppress Add: Variable resolving/support in configuration file (generic variable. Add: hostname and interface to possible CSV field Feature requested by: Phil Daws Add: spo_database configuration keyword "disable_signature_reference_table" was added and reconnect_sleep_time, connection_limit defined in doc/README.database. Fixed: Added extra check when generating sig_reference cache. (Martin Olsson) Fixed: sid-msg.map and gen-msg.map double declaration issue (using command line and directive is now prohibited) [ will bail if both are used (-S and config sid_file OR -G and config gen_file.] Fixed: syslog_full in complete mode IP information (Fäbu Hufi) Fixed: database, could stop processing event when some ip options where null (John Naggets) Fixed: Removed some database messages and move them to debug message if the propre debug flag is used. --- README | 2 +- autogen.sh | 3 +- configure.in | 2 +- doc/README.database | 25 +- doc/README.sig_suppress | 64 +++ etc/barnyard2.conf | 7 + src/barnyard2.c | 91 +++- src/barnyard2.h | 95 +++- src/debug.h | 31 +- src/map.c | 693 ++++++++++++++++++++---- src/map.h | 26 +- src/output-plugins/spo_alert_csv.c | 23 + src/output-plugins/spo_database.c | 48 +- src/output-plugins/spo_database.h | 5 +- src/output-plugins/spo_database_cache.c | 161 ++++-- src/output-plugins/spo_syslog_full.c | 2 +- src/parser.c | 463 +++++++++++++++- src/parser.h | 3 + src/plugbase.c | 67 +++ src/util.c | 45 +- src/util.h | 1 + 21 files changed, 1635 insertions(+), 222 deletions(-) create mode 100644 doc/README.sig_suppress diff --git a/README b/README index 07fbdad..638d025 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ 0. SUMMARY ------------------------------------------------------------------------------ -Barnyard2 - version 2-1.12 +Barnyard2 - version 2-1.13 This README contains some quick information about how to set up and configure barnyard2 to ensure it works as it should. diff --git a/autogen.sh b/autogen.sh index b7a4df0..0a62b1d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,5 +10,6 @@ else echo "Failed to find libtoolize or glibtoolize, please ensure it is installed and accessible via your PATH env variable" exit 1 fi; -autoreconf -fv --install +#autoreconf -fv --install +autoreconf -fvi echo "You can now run \"./configure\" and then \"make\"." diff --git a/configure.in b/configure.in index a3d309e..a3e757b 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_PREREQ(2.50) AC_INIT(src/barnyard2.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(barnyard2,1.12) +AM_INIT_AUTOMAKE(barnyard2,1.13-BETA) AC_CONFIG_MACRO_DIR([m4]) LT_INIT diff --git a/doc/README.database b/doc/README.database index 4fd3a09..ed212fb 100644 --- a/doc/README.database +++ b/doc/README.database @@ -4,9 +4,11 @@ The database output plug-in enables snort to log to - Postgresql, - MySQL, - - any unixODBC database, - - MS SQL Server and - - Oracle. + +# Currently unsupported. +# - any unixODBC database, +# - MS SQL Server and +# - Oracle. This README contains some quick information about how to set up and configure database logging with in snort. More complete and @@ -34,9 +36,11 @@ working. (unixODBC + some other RDBMS) MySQL => http://www.mysql.org Postgresql => http://www.postgesql.org - unixODBC => http://www.unixodbc.org - Oracle => http://www.oracle.com - SQL Server => http://www.microsoft.com + +# Currently Unsupported +# unixODBC => http://www.unixodbc.org +# Oracle => http://www.oracle.com +# SQL Server => http://www.microsoft.com 2) Follow directions from your database vendor to be sure your RDBMS is properly configured and secured. @@ -207,7 +211,16 @@ Arguments: [yes|1]: Ignore the BPF part when looking for the server definition + connection_limit : default 10 - The maximum number of time that barnyard2 will tolerate a transaction faillure and or + database connection failure. + + reconnect_sleep_time : default 5 - The number of seconds to sleep betwen connection retry. + disable_signature_reference_table - Tell the output plugin not to synchronize the sig_reference table in the schema. + This option will speedup the process, especialy if you use sid-msg.mapv2 file or + have alot of signature already in databases. + (Make sure that you do not need that information before enablign this) + MYSQL ONLY diff --git a/doc/README.sig_suppress b/doc/README.sig_suppress new file mode 100644 index 0000000..8ce9d76 --- /dev/null +++ b/doc/README.sig_suppress @@ -0,0 +1,64 @@ +-=Barnyard2 Team=- + +================================================== + +Barnyard2 support event suppression at the +spooler level using the configuration directive sig_suppress. + +Syntax: +======= +config sig_suppress: (GID):(SID) + +Note: +GID is optional and SID can be a single SID or a range (START)-(END) (see below). + +EX: +======= +config sig_suppress: 1:10 +AND +config sig_suppress: 10 + +The above expressions ARE equivalent. + +config sig_suppress: 1:10 +AND +config sig_suppress: 112:10 + +The above expressions ARE NOT equivalent because one speficy gid 1 (alert) while the other speficy gid 112 (spp_arpspoof) + +config sig_suppress: 10-40 <= RANGE +IS equivalent to + config sig_suppress: 1:10-40 <= RANGE +AND ALSO equivalent to + config sig_suppress: 10,11,12,13,14,15,16....,38,39,40 + +NOTE: single entries are less effective,especially if you have large lists. + +As the time of this writing, if you change the list you will need to restart the process (STOP/START) and not SIGHUP +if you want the changes to be applied to event processing. + +If we define the following list (overlaping entries are ignored or replaced when a range covering them is encountered): +config sig_suppress: 1:10,20,1:30,2:90-102 +config sig_suppress: 1:10,1:30-40,15,10-40,25 +config sig_suppress: 1:10,50-55,15,10-20,80,51-52,31-35 +config sig_suppress: 2:93,2:95,2:100-101,2:91-122,22-27,2008175,2657,2011766,9900009,2001972,2101623 + +So with the example above the final list is the following: + + +[ Signature Suppress list ]+ + ---------------------------- + -- Element type:[RANGE ] gid:[2] sid min:[90] sid max:[122] + -- Element type:[RANGE ] gid:[1] sid min:[30] sid max:[40] + -- Element type:[RANGE ] gid:[1] sid min:[50] sid max:[55] + -- Element type:[RANGE ] gid:[1] sid min:[10] sid max:[20] + -- Element type:[SINGLE] gid:[1] sid min:[80] sid max:[80] + -- Element type:[RANGE ] gid:[1] sid min:[22] sid max:[27] + -- Element type:[SINGLE] gid:[1] sid min:[2008175] sid max:[2008175] + -- Element type:[SINGLE] gid:[1] sid min:[2657] sid max:[2657] + -- Element type:[SINGLE] gid:[1] sid min:[2011766] sid max:[2011766] + -- Element type:[SINGLE] gid:[1] sid min:[9900009] sid max:[9900009] + -- Element type:[SINGLE] gid:[1] sid min:[2001972] sid max:[2001972] + -- Element type:[SINGLE] gid:[1] sid min:[2101623] sid max:[2101623] + ---------------------------- + +[ Signature Suppress list ]+ + diff --git a/etc/barnyard2.conf b/etc/barnyard2.conf index 24e9b4f..cba3c7e 100644 --- a/etc/barnyard2.conf +++ b/etc/barnyard2.conf @@ -29,6 +29,13 @@ config classification_file: /etc/snort/classification.config config gen_file: /etc/snort/gen-msg.map config sid_file: /etc/snort/sid-msg.map + +# Configure signature suppression at the spooler level see doc/README.sig_suppress +# +# +#config sig_suppress: 1:10 + + # Set the event cache size to defined max value before recycling of event occur. # # diff --git a/src/barnyard2.c b/src/barnyard2.c index de748b6..903910f 100644 --- a/src/barnyard2.c +++ b/src/barnyard2.c @@ -210,6 +210,8 @@ extern int optind; extern int opterr; extern int optopt; + + /* Private function prototypes ************************************************/ static void InitNetmasks(void); static void InitProtoNames(void); @@ -719,9 +721,7 @@ static void ParseCmdLine(int argc, char **argv) ConfigSetGid(bc, optarg); break; - case 'G': /* snort loG identifier */ - ConfigGenFile(bc, optarg); - break; + case 'h': ConfigHostname(bc, optarg); @@ -790,9 +790,13 @@ static void ParseCmdLine(int argc, char **argv) #endif break; - case 'S': /* set a rules file variable */ - ConfigSidFile(bc, optarg); - break; + case 'S': /* set a rules file variable */ + bc->sid_msg_file = strndup(optarg,PATH_MAX); + break; + + case 'G': /* snort preprocessor identifier */ + bc->gen_msg_file = strndup(optarg,PATH_MAX); + break; case 't': /* chroot to the user specified directory */ ConfigChrootDir(bc, optarg); @@ -1533,7 +1537,7 @@ static Barnyard2Config * MergeBarnyard2Confs(Barnyard2Config *cmd_line, Barnyard FatalError("%s(%d) Merging barnyard2 configs: barnyard2 conf is NULL.\n", __FILE__, __LINE__); } - + ResolveOutputPlugins(cmd_line, config_file); if (config_file == NULL) @@ -1555,13 +1559,53 @@ static Barnyard2Config * MergeBarnyard2Confs(Barnyard2Config *cmd_line, Barnyard if (config_file == NULL) return cmd_line; + + if(cmd_line->ssHead) + config_file->ssHead = cmd_line->ssHead; + + if( (cmd_line->sid_msg_file) && + (config_file->sid_msg_file)) + { + FatalError("The sid map file was included two times command line (-S) [%s] and in the configuration file (config sid_map) [%s].\n" + "It only need to be defined once.\n", + cmd_line->sid_msg_file, + config_file->sid_msg_file); + } + + if( (cmd_line->gen_msg_file) && + (config_file->gen_msg_file)) + { + FatalError("The gen map file was included two times command line (-G) [%s] and in the configuration file (config gen_map) [%s].\n" + "It only need to be defined once.\n", + cmd_line->gen_msg_file, + config_file->gen_msg_file); + } + + if( (cmd_line->sid_msg_file != NULL) && + (config_file->sid_msg_file == NULL)) + { + config_file->sid_msg_file = cmd_line->sid_msg_file; + cmd_line->sid_msg_file = NULL; + } + if( (cmd_line->gen_msg_file != NULL) && + (config_file->gen_msg_file == NULL)) + { + config_file->gen_msg_file = cmd_line->gen_msg_file; + cmd_line->gen_msg_file = NULL; + } + if( cmd_line->event_cache_size > config_file->event_cache_size) { config_file->event_cache_size = cmd_line->event_cache_size; } + /* In case */ + if(cmd_line->sidmap_version > config_file->sidmap_version) + { + config_file->sidmap_version = cmd_line->sidmap_version; + } /* Used because of a potential chroot */ @@ -1777,6 +1821,22 @@ static void Barnyard2Init(int argc, char **argv) * Set the global barnyard2_conf that will be used during run time */ barnyard2_conf = MergeBarnyard2Confs(barnyard2_cmd_line_conf, bc); + DisplaySigSuppress(BCGetSigSuppressHead()); + + if(ReadSidFile(barnyard2_conf)) + { + FatalError("[%s()], failed while processing [%s] \n", + __FUNCTION__, + bc->sid_msg_file); + } + + if(ReadGenFile(barnyard2_conf)) + { + FatalError("[%s()], failed while processing [%s] \n", + __FUNCTION__, + bc->gen_msg_file); + } + if(barnyard2_conf->event_cache_size == 0) { barnyard2_conf->event_cache_size = 2048; @@ -1787,9 +1847,22 @@ static void Barnyard2Init(int argc, char **argv) } + /* Resolve classification integer for signature and free some memory */ + if(barnyard2_conf->sidmap_version == SIDMAPV2) + { + if(SignatureResolveClassification(barnyard2_conf->classifications, + (SigNode *)*BcGetSigNodeHead(), + barnyard2_conf->sid_msg_file, + barnyard2_conf->class_file)) + { + FatalError("[%s()], Call to SignatureResolveClassification failed \n", + __FUNCTION__); + } + } + /* pcap_snaplen is already initialized to SNAPLEN */ -// if (barnyard2_conf->pkt_snaplen != -1) -// pcap_snaplen = (uint32_t)snort_conf->pkt_snaplen; + // if (barnyard2_conf->pkt_snaplen != -1) + // pcap_snaplen = (uint32_t)snort_conf->pkt_snaplen; /* Display barnyard2 version information here so that we can also show dynamic * plugin versions, if loaded. */ diff --git a/src/barnyard2.h b/src/barnyard2.h index 4a79837..91c00f8 100644 --- a/src/barnyard2.h +++ b/src/barnyard2.h @@ -62,8 +62,8 @@ #define PROGRAM_NAME "Barnyard" #define VER_MAJOR "2" #define VER_MINOR "1" -#define VER_REVISION "12" -#define VER_BUILD "321" +#define VER_REVISION "13-BETA" +#define VER_BUILD "325" #define STD_BUF 1024 @@ -89,6 +89,15 @@ #define TIMEBUF_SIZE 26 + +#ifndef ULONG_MAX +# if __WORDSIZE == 64 +# define ULONG_MAX 18446744073709551615UL +# else +# define ULONG_MAX 4294967295UL +# endif +#endif + #define DO_IP_CHECKSUMS 0x00000001 #define DO_TCP_CHECKSUMS 0x00000002 #define DO_UDP_CHECKSUMS 0x00000004 @@ -121,6 +130,14 @@ # define DEFAULT_LABELCHAIN_LENGTH -1 #endif + +/* SIDMAP V2 */ +#define SIDMAPV2STRING "v2\n" +#define SIDMAPV1 0x01 +#define SIDMAPV2 0x02 +/* SIDMAP V2 */ + + /* This macro helps to simplify the differences between Win32 and non-Win32 code when printing out the name of the interface */ #ifndef WIN32 @@ -288,6 +305,20 @@ typedef struct _VarNode } VarNode; + +#define SS_SINGLE 0x0001 +#define SS_RANGE 0x0002 + +typedef struct _SigSuppress_list +{ + u_int8_t ss_type; /* Single or Range */ + u_int8_t flag; /* Flagged for deletion */ + unsigned long gid; /* Generator id */ + unsigned long ss_min; /* VAL for SS_SINGLE, MIN VAL for RANGE */ + unsigned long ss_max; /* VAL for SS_SINGLE, MAX VAL for RANGE */ + struct _SigSuppress_list *next; +} SigSuppress_list; + /* struct to contain the program variables and command line args */ typedef struct _Barnyard2Config { @@ -296,9 +327,7 @@ typedef struct _Barnyard2Config int run_flags; int output_flags; int logging_flags; -// int log_tcpdump; -// int no_log; - + unsigned int event_cache_size; VarEntry *var_table; @@ -319,7 +348,9 @@ typedef struct _Barnyard2Config char *class_file; /* -C or config class_map */ char *sid_msg_file; /* -S or config sid_map */ + short sidmap_version; /* Set by ReadSidFile () */ char *gen_msg_file; /* -G or config gen_map */ + char *reference_file; /* -R or config reference_map */ char *log_dir; /* -l or config log_dir */ char *orig_log_dir; /* set in case of chroot */ @@ -394,10 +425,14 @@ typedef struct _Barnyard2Config int print_version; int usr_signal; int cant_hup_signal; + + SigSuppress_list *ssHead; ClassType *classifications; ReferenceSystemNode *references; + SigNode *sigHead; /* Signature list Head */ + /* plugin active flags*/ InputConfig *input_configs; OutputConfig *output_configs; @@ -414,6 +449,7 @@ typedef struct _PacketCount uint64_t total_packets; uint64_t total_processed; uint64_t total_unknown; + uint64_t total_suppressed; uint64_t s5tcp1; uint64_t s5tcp2; @@ -727,5 +763,54 @@ static INLINE long int BcMplsPayloadType(void) { return barnyard2_conf->mpls_payload_type; } + #endif + +static INLINE short BcSidMapVersion(void) +{ + return barnyard2_conf->sidmap_version; +} + +static INLINE SigNode ** BcGetSigNodeHead(void) +{ + return &barnyard2_conf->sigHead; +} + +static INLINE Barnyard2Config * BcGetConfig(void) +{ + return barnyard2_conf; +} + +static INLINE char * BcGetSourceFile(u_int8_t source_file) +{ + switch(source_file) + { + + case SOURCE_SID_MSG: + return barnyard2_conf->sid_msg_file; + break; + + + case SOURCE_GEN_MSG: + return barnyard2_conf->gen_msg_file; + break; + + default: + return "UKNOWN FILE\n"; + break; + } +} + +static INLINE SigSuppress_list ** BCGetSigSuppressHead(void) +{ + return &barnyard2_conf->ssHead; +} + +static INLINE void SigSuppressCount(void) +{ + pc.total_suppressed++; + return; +} + + #endif /* __BARNYARD2_H__ */ diff --git a/src/debug.h b/src/debug.h index 3b33722..a963903 100644 --- a/src/debug.h +++ b/src/debug.h @@ -44,20 +44,23 @@ #define DEBUG_VARIABLE "BARNYARD2_DEBUG" -#define DEBUG_ALL 0xffffffff /* 4294967295 */ -#define DEBUG_INIT 0x00000001 /* 1 */ -#define DEBUG_CONFIGRULES 0x00000002 /* 2 */ -#define DEBUG_PLUGIN 0x00000004 /* 4 */ -#define DEBUG_VARS 0x00000010 /* 16 */ -#define DEBUG_LOG 0x00000020 /* 32 */ -#define DEBUG_FLOW 0x00000040 -#define DEBUG_DECODE 0x00000080 -#define DEBUG_DATALINK 0x00000100 -#define DEBUG_INPUT_PLUGIN 0x00000200 -#define DEBUG_OUTPUT_PLUGIN 0x00000400 -#define DEBUG_SPOOLER 0x00000800 -#define DEBUG_MAPS 0x00001000 -#define DEBUG_PATTERN_MATCH 0x00080000 +#define DEBUG_ALL 0xffffffff /* 4294967295 */ +#define DEBUG_INIT 0x00000001 /* 1 */ +#define DEBUG_CONFIGRULES 0x00000002 /* 2 */ +#define DEBUG_PLUGIN 0x00000004 /* 4 */ +#define DEBUG_VARS 0x00000010 /* 16 */ +#define DEBUG_LOG 0x00000020 /* 32 */ +#define DEBUG_FLOW 0x00000040 +#define DEBUG_DECODE 0x00000080 +#define DEBUG_DATALINK 0x00000100 +#define DEBUG_INPUT_PLUGIN 0x00000200 +#define DEBUG_OUTPUT_PLUGIN 0x00000400 +#define DEBUG_SPOOLER 0x00000800 +#define DEBUG_MAPS 0x00001000 +#define DEBUG_MAPS_DEEP 0x00002000 +#define DEBUG_PATTERN_MATCH 0x00080000 +#define DEBUG_SID_SUPPRESS 0x00100000 +#define DEBUG_SID_SUPPRESS_PARSE 0x00200000 void DebugMessageFunc(int dbg,char *fmt, ...); #ifdef HAVE_WCHAR_H diff --git a/src/map.c b/src/map.c index 8bd57f6..758e93f 100644 --- a/src/map.c +++ b/src/map.c @@ -122,7 +122,7 @@ void ParseReference(Barnyard2Config *bc, char *args, SigNode *sn) char **toks, *system, *id; int num_toks; - DEBUG_WRAP(DebugMessage(DEBUG_MAPS, "map: parsing reference %s\n", args);); + DEBUG_WRAP(DebugMessage(DEBUG_MAPS_DEEP, "map: parsing reference %s\n", args);); /* 2 tokens: system, id */ toks = mSplit(args, ",", 2, &num_toks, 0); @@ -319,6 +319,28 @@ ClassType * ClassTypeLookupByType(Barnyard2Config *bc, char *type) return node; } +ClassType * ClassTypeLookupByTypePure(ClassType *node, char *type) +{ + + if( (node == NULL) || + (type == NULL)) + { + return NULL; + } + + + while (node != NULL) + { + if (strcasecmp(type, node->type) == 0) + return node; + + node = node->next; + } + + return NULL; +} + + /* NOTE: This lookup can only be done during parse time */ /* Wut ...*/ ClassType * ClassTypeLookupById(Barnyard2Config *bc, int id) @@ -459,6 +481,8 @@ int ReadClassificationFile(Barnyard2Config *bc, const char *file) return -1; } + bc->class_file =(char *)file; + memset(buf, 0, BUFFER_SIZE); /* bzero() deprecated, replaced with memset() */ while ( fgets(buf, BUFFER_SIZE, fd) != NULL ) @@ -468,7 +492,7 @@ int ReadClassificationFile(Barnyard2Config *bc, const char *file) /* advance through any whitespace at the beginning of the line */ while (*index == ' ' || *index == '\t') index++; - + /* if it's not a comment or a , send it to the parser */ if ( (*index != '#') && (*index != 0x0a) && (index != NULL) ) { @@ -494,41 +518,221 @@ int ReadClassificationFile(Barnyard2Config *bc, const char *file) /************************* Sid/Gid Map Implementation *************************/ -SigNode *sigTypes = NULL; -int ReadSidFile(Barnyard2Config *bc, const char *file) + +/* + Classification parsing should happen before signature parsing, + so classification resolution should be done at signature initialization. + + But at the moment this function was written classification could be parsed before + signature or signature before classification, thus leading to possible unresolvability. + + hence. +*/ +int SignatureResolveClassification(ClassType *class,SigNode *sig,char *sid_msg_file,char *classification_file) +{ + + ClassType *found = NULL; + + if( (class == NULL) || + (sig == NULL) || + (sid_msg_file == NULL) || + (classification_file == NULL)) + { + DEBUG_WRAP(DebugMessage(DEBUG_MAPS,"ERROR [%s()]: Failed class ptr [0x%x], sig ptr [0x%x], " + "sig_literal ptr [0x%x], sig_map_file ptr [0x%x], classification_file ptr [0x%x] \n", + class, + sig, + sig->classLiteral, + sid_msg_file, + classification_file);); + return 1; + } + + while(sig != NULL) + { + found = NULL; + + if(sig->classLiteral) + { + if(strncasecmp(sig->classLiteral,"NOCLASS",strlen("NOCLASS")) == 0) + { + DEBUG_WRAP(DebugMessage(DEBUG_MAPS, + "\nINFO: [%s()],In File [%s] \n" + "Signature [gid: %d] [sid : %d] [revision: %d] message [%s] has no classification [%s] defined, signature priority is [%d]\n\n", + __FUNCTION__, + BcGetSourceFile(sig->source_file), + sig->generator, + sig->id, + sig->rev, + sig->msg, + sig->classLiteral, + sig->priority);); + + } + else if( (found = ClassTypeLookupByTypePure(class,sig->classLiteral)) == NULL) + { + sig->class_id = 0; + } + else + { + sig->class_id = found->id; + } + } + else + { + if(sig->class_id == 0) + { + + DEBUG_WRAP(DebugMessage(DEBUG_MAPS"\nINFO: [%s()],In file [%s]\n" + "Signature [gid: %d] [sid : %d] [revision: %d] message [%s] has no classification literal defined, signature priority is [%d]\n\n", + __FUNCTION__, + BcGetSourceFile(sig->source_file), + sig->generator, + sig->id, + sig->rev, + sig->msg, + sig->priority);); + } + } + + if(sig->priority == 0) + { + if(found) + sig->priority = found->priority; + } + else + { + if( (found) && + (found->priority != sig->priority)) + { + DEBUG_WRAP(DebugMessage(DEBUG_MAPS"\nINFO: [%s()],In file [%s]\n" + "Signature [gid: %d] [sid : %d] [revision: %d] message [%s] has classification [%s] priority [%d]\n" + "The priority define by the rule will overwride classification [%s] priority [%d] defined in [%s] using [%d] as priority \n\n", + __FUNCTION__, + BcGetSourceFile(sig->source_file), + sig->generator, + sig->id, + sig->rev, + sig->msg, + sig->classLiteral, + sig->priority, + found->type, + found->priority, + classification_file, + sig->priority);); + } + } + + if(sig->classLiteral) + { + free(sig->classLiteral); + sig->classLiteral = NULL; + } + + sig = sig->next; + } + + return 0; +} + +u_int32_t SigLookup(SigNode *head,u_int32_t gid,u_int32_t sid,u_int8_t source_file,SigNode **r_node) +{ + if( (head == NULL) || + (r_node == NULL)) + { + return 0; + } + + while(head != NULL) + { + + if(head->source_file == source_file) + { + if( (head->generator == gid) && + (head->id == sid)) + { + *r_node = head; + return 1; + } + } + + head = head->next; + } + + + *r_node = NULL; + return 0; + +} + + + +int ReadSidFile(Barnyard2Config *bc) { FILE *fd; char buf[BUFFER_SIZE]; char *index; int count = 0; - DEBUG_WRAP(DebugMessage(DEBUG_MAPS, "map: opening file %s\n", file);); + if(bc == NULL) + { + return 1; + } - if( (fd = fopen(file, "r")) == NULL ) + if(bc->sid_msg_file == NULL) { - LogMessage("ERROR: Unable to open SID file '%s' (%s)\n", file, - strerror(errno)); - - return -1; + return 0; } + DEBUG_WRAP(DebugMessage(DEBUG_MAPS, "[%s()] map: opening file %s\n", + __FUNCTION__, + bc->sid_msg_file);); + + if( (fd = fopen(bc->sid_msg_file, "r")) == NULL ) + { + LogMessage("ERROR: Unable to open SID file '%s' (%s)\n", + bc->sid_msg_file, + strerror(errno)); + return 1; + } + memset(buf, 0, BUFFER_SIZE); /* bzero() deprecated, replaced by memset() */ while(fgets(buf, BUFFER_SIZE, fd) != NULL) { index = buf; - + /* advance through any whitespace at the beginning of the line */ while(*index == ' ' || *index == '\t') index++; + + /* Check if we are dealing with a sidv2 file */ + if( (count == 0) && + (bc->sidmap_version == 0)) + { + if(*index == '#') + { + index++; + if( strncasecmp(index,SIDMAPV2STRING,strlen(SIDMAPV2STRING)) == 0) + { + bc->sidmap_version=SIDMAPV2; + } + } + else + { + bc->sidmap_version=SIDMAPV1; + } + + continue; + } - /* if it's not a comment or a , send it to the parser */ - if((*index != '#') && (*index != 0x0a) && (index != NULL)) - { - ParseSidMapLine(bc, index); - count++; - } + /* if it's not a comment or a , send it to the parser */ + if((*index != '#') && (*index != 0x0a) && (index != NULL)) + { + ParseSidMapLine(bc, index); + count++; + } } //LogMessage("Read [%u] signature \n",count); @@ -536,23 +740,28 @@ int ReadSidFile(Barnyard2Config *bc, const char *file) if(fd != NULL) fclose(fd); - return count; + return 0; } void DeleteSigNodes() { SigNode *sn = NULL, *snn = NULL; + SigNode **sigHead = NULL; + ReferenceNode *rn = NULL, *rnn = NULL; - sn = sigTypes; - + sigHead = BcGetSigNodeHead(); + sn = *sigHead; + while(sn != NULL) { snn = sn->next; /* free the message */ if(sn->msg) + { free(sn->msg); + } /* free the references (NOT the reference systems) */ if(sn->refs) @@ -572,89 +781,272 @@ void DeleteSigNodes() rn = rnn; } } - + /* free the signature node */ - free(sigTypes); - - sigTypes = snn; + free(sn); + sn = NULL; + sn = snn; } - - sigTypes = NULL; + + if(*sigHead != NULL) + { + free(*sigHead); + *sigHead = NULL; + } + + return; } void ParseSidMapLine(Barnyard2Config *bc, char *data) { - char **toks; - char *idx; - int num_toks; - int i; - SigNode *sn; + SigNode *sn = NULL; + SigNode t_sn = {0}; + + char **toks = NULL; + char *idx = NULL; + + int num_toks = 0; + int min_toks = 0; + int i = 0; + toks = mSplitSpecial(data, "||", 32, &num_toks, '\0'); + + switch(bc->sidmap_version) + { + case SIDMAPV1: + min_toks = 2; + break; - if(num_toks < 2) + case SIDMAPV2: + min_toks = 6; + break; + + default: + FatalError("[%s()]: Unknown sidmap file version [%d] \n", + __FUNCTION__, + bc->sidmap_version); + } + + if(num_toks < min_toks) { LogMessage("WARNING: Ignoring bad line in SID file: '%s'\n", data); } else { - DEBUG_WRAP(DebugMessage(DEBUG_MAPS, "map: creating new node\n");); + DEBUG_WRAP(DebugMessage(DEBUG_MAPS_DEEP, "map: creating new node\n");); - sn = CreateSigNode(&sigTypes); - + for(i = 0; igenerator = 1; - sn->id = strtoul(idx, NULL, 10); - break; + if( (idx == NULL) || + (strlen(idx) == 0)) + { + LogMessage("\n"); + FatalError("[%s()], File [%s],\nError in map definition [%s] for value [%s] \n\n", + __FUNCTION__, + bc->sid_msg_file, + data, + idx); + } + + switch(bc->sidmap_version) + { + case SIDMAPV1: + switch(i) + { + case 0: /* sid */ + t_sn.generator = 1; + if( (t_sn.id = strtoul(idx, NULL, 10)) == ULONG_MAX) + { + FatalError("[%s()], error converting integer [%s] for line [%s] \n", + __FUNCTION__, + strerror(errno), + data); + } + break; + case 1: /* msg */ - sn->msg = SnortStrdup(idx); + if( (t_sn.msg = SnortStrdup(idx)) == NULL) + { + FatalError("[%s()], error converting string for line [%s] \n", + __FUNCTION__, + data); + } break; - + default: /* reference data */ - ParseReference(bc, idx, sn); + ParseReference(bc, idx, &t_sn); break; - } + } + break; + + case SIDMAPV2: + + switch(i) + { + + case 0: /*gid */ + if( (t_sn.generator = strtoul(idx,NULL,10)) == ULONG_MAX) + { + FatalError("[%s()], error converting integer [%s] for line [%s] \n", + __FUNCTION__, + strerror(errno), + data); + } + + break; + + case 1: /* sid */ + if( (t_sn.id = strtoul(idx, NULL, 10)) == ULONG_MAX) + { + FatalError("[%s()], error converting integer [%s] for line [%s] \n", + __FUNCTION__, + strerror(errno), + data); + } + break; + + case 2: /* revision */ + if( (t_sn.rev = strtoul(idx, NULL, 10)) == ULONG_MAX) + { + FatalError("[%s()], error converting integer [%s] for line [%s] \n", + __FUNCTION__, + strerror(errno), + data); + } + break; + + case 3: /* classification */ + if( (t_sn.classLiteral = SnortStrdup(idx)) == NULL) + { + FatalError("[%s()], error converting string for line [%s] \n", + __FUNCTION__, + data); + } + break; + + case 4: /* priority */ + + if( (t_sn.priority = strtoul(idx, NULL, 10)) == ULONG_MAX) + { + FatalError("[%s()], error converting integer [%s] for line [%s] \n", + __FUNCTION__, + strerror(errno), + data); + } + break; + + case 5: /* msg */ + if( (t_sn.msg = SnortStrdup(idx)) == NULL) + { + FatalError("[%s()], error converting string for line [%s] \n", + __FUNCTION__, + data); + } + break; + + default: /* reference data */ + ParseReference(bc, idx, &t_sn); + break; + } + break; + } + } + } + + sn = (SigNode *)*BcGetSigNodeHead(); + + /* Look if we have a brother inserted from sid map file */ + sig_lookup_continue: + if(SigLookup(sn,t_sn.generator,t_sn.id,SOURCE_SID_MSG,&sn)) + { + if(t_sn.rev == sn->rev) + { + DEBUG_WRAP(DebugMessage(DEBUG_MAPS, + "[%s()],Item not inserted [ gid:[%d] sid:[%d] rev:[%d] msg:[%s] class:[%d] prio:[%d] ] in signature list \n" + "\t Item already present [ gid:[%d] sid:[%d] rev:[%d] msg:[%s] class:[%d] prio:[%d] ] \n", + __FUNCTION__, + t_sn.generator,t_sn.id,t_sn.rev,t_sn.msg,t_sn.class_id,t_sn.priority, /* revision,class_id and priority are hardcoded for generator */ + sn->generator,sn->id,sn->rev,sn->msg,sn->class_id,sn->priority);); + } + else + { + /* Continue to traverse the list to be sure */ + sn = sn->next; + goto sig_lookup_continue; + } + } + else + { + if( (sn = CreateSigNode(BcGetSigNodeHead(),SOURCE_SID_MSG)) == NULL) + { + FatalError("[%s()], CreateSigNode() returned a NULL node, bailing \n", + __FUNCTION__); } + + memcpy(sn,&t_sn,sizeof(SigNode)); + + sn->source_file = SOURCE_SID_MSG; } mSplitFree(&toks, num_toks); - + return; } SigNode *GetSigByGidSid(u_int32_t gid, u_int32_t sid,u_int32_t revision) { /* set temp node pointer to the Sid map list head */ - SigNode *sn = sigTypes; - - /* a snort general rule (gid=1) and a snort dynamic rule (gid=3) use the */ - /* the same sids and thus can be considered one in the same. */ - if (gid == 3) - gid = 1; + SigNode **sh = BcGetSigNodeHead(); + SigNode *sn = *sh; - /* find any existing Snort ID's that match */ - while (sn != NULL) + switch(BcSidMapVersion()) { - if (sn->generator == gid && sn->id == sid) + case SIDMAPV1: + /* The comment below is not true anymore with sidmapv2 files generated by pulled pork */ + + /* a snort general rule (gid=1) and a snort dynamic rule (gid=3) use the */ + /* the same sids and thus can be considered one in the same. */ + if (gid == 3) + { + gid = 1; + } + + /* find any existing Snort ID's that match */ + while (sn != NULL) + { + if (sn->generator == gid && sn->id == sid) + { + return sn; + } + + sn = sn->next; + } + break; + + case SIDMAPV2: + while (sn != NULL) { - return sn; + if ( (sn->generator == gid) && + (sn->id == sid) && + (sn->rev == revision)) + { + return sn; + } + + sn = sn->next; } - - sn = sn->next; + break; } - - /* create a default message since we didn't find any match */ - sn = CreateSigNode(&sigTypes); + + /* create a default message since we didn't find any match */ + sn = CreateSigNode(BcGetSigNodeHead(),SOURCE_GEN_RUNTIME); sn->generator = gid; sn->id = sid; sn->rev = revision; @@ -664,24 +1056,28 @@ SigNode *GetSigByGidSid(u_int32_t gid, u_int32_t sid,u_int32_t revision) return sn; } -SigNode *CreateSigNode(SigNode **head) -{ - SigNode *sn; + +SigNode *CreateSigNode(SigNode **head,const u_int8_t source_file) +{ + SigNode *sn = NULL; + if (*head == NULL) { *head = (SigNode *) SnortAlloc(sizeof(SigNode)); + sn = *head; + sn->source_file = source_file; return *head; } else { sn = *head; - + while (sn->next != NULL) sn = sn->next; sn->next = (SigNode *) SnortAlloc(sizeof(SigNode)); - + sn->next->source_file = source_file; return sn->next; } @@ -689,22 +1085,31 @@ SigNode *CreateSigNode(SigNode **head) return NULL; } -int ReadGenFile(Barnyard2Config *bc, const char *file) +int ReadGenFile(Barnyard2Config *bc) { FILE *fd; char buf[BUFFER_SIZE]; char *index; - int count = 0; + int count = 0; - - if ( (fd = fopen(file, "r")) == NULL ) + if(bc->gen_msg_file == NULL) { - LogMessage("ERROR: Unable to open Generator file \"%s\": %s\n", file, - strerror(errno)); - - return -1; + return 0; } + + DEBUG_WRAP(DebugMessage(DEBUG_MAPS, "[%s()] map: opening file %s\n", + __FUNCTION__, + bc->gen_msg_file);); + if ( (fd = fopen(bc->gen_msg_file, "r")) == NULL ) + { + LogMessage("ERROR: Unable to open Generator file \"%s\": %s\n", + bc->gen_msg_file, + strerror(errno)); + + return 1; + } + memset(buf, 0, BUFFER_SIZE); /* bzero() deprecated, replaced by memset() */ while( fgets(buf, BUFFER_SIZE, fd) != NULL ) @@ -722,24 +1127,27 @@ int ReadGenFile(Barnyard2Config *bc, const char *file) count++; } } - + //LogMessage("Read [%u] gen \n",count); - - if(fd != NULL) - fclose(fd); - - return 0; + + if(fd != NULL) + fclose(fd); + + return 0; } void ParseGenMapLine(char *data) { - char **toks; - int num_toks; - int i; - char *idx; - SigNode *sn; + char **toks = NULL; + char *idx = NULL; + + SigNode *sn = NULL; + SigNode t_sn = {0}; /* used for temp storage before lookup */ + int num_toks = 0; + int i = 0; + toks = mSplitSpecial(data, "||", 32, &num_toks, '\0'); if(num_toks < 2) @@ -748,28 +1156,41 @@ void ParseGenMapLine(char *data) return; } - sn = CreateSigNode(&sigTypes); - for(i=0; igenerator = strtoul(idx, NULL, 10); + if( (t_sn.generator = strtoul(idx, NULL, 10)) == ULONG_MAX) + { + FatalError("[%s()], error converting integer [%s] for line [%s] \n", + __FUNCTION__, + strerror(errno), + data); + } break; case 1: /* sid */ - //TODO: error checking on conversion - sn->id = strtoul(idx, NULL, 10); + if( (t_sn.id = strtoul(idx, NULL, 10)) == ULONG_MAX) + { + FatalError("[%s()], error converting integer [%s] for line [%s] \n", + __FUNCTION__, + strerror(errno), + data); + } break; case 2: /* msg */ - sn->msg = SnortStrdup(idx); + if( (t_sn.msg = SnortStrdup(idx)) == NULL) + { + FatalError("[%s()], error converting string for line [%s] \n", + __FUNCTION__, + data); + } break; default: @@ -777,5 +1198,89 @@ void ParseGenMapLine(char *data) } } + /* + Generators have pre-defined revision,classification and priority + */ + t_sn.rev = 1; + t_sn.classLiteral = strdup("NOCLASS"); /* default */ + t_sn.class_id = 0; + t_sn.priority = 3; + + /* Look if we have a brother inserted from sid map file */ + if(SigLookup((SigNode *)*BcGetSigNodeHead(),t_sn.generator,t_sn.id,SOURCE_SID_MSG,&sn)) + { + + DEBUG_WRAP(DebugMessage(DEBUG_MAPS, + "[%s()],Item not inserted [ gid:[%d] sid:[%d] rev:[%d] msg:[%s] class:[%d] prio:[%d] ] in signature list \n" + "\t Item already present [ gid:[%d] sid:[%d] rev:[%d] msg:[%s] class:[%d] prio:[%d] ] \n", + __FUNCTION__, + t_sn.generator,t_sn.id,t_sn.rev,t_sn.msg,t_sn.class_id,t_sn.priority, /* revision,class_id and priority are hardcoded for generator */ + sn->generator,sn->id,sn->rev,sn->msg,sn->class_id,sn->priority);); + + /* + This is a quick hack for now to put sweet gid-msg.map messages up there + */ + if(t_sn.msg) + { + DEBUG_WRAP(DebugMessage(DEBUG_MAPS,"[%s()], swapping message [%s] for [%s] \n", + __FUNCTION__, + sn->msg, + t_sn.msg);); + free(sn->msg); + sn->msg = NULL; + sn->msg = t_sn.msg; + t_sn.msg = NULL; + } + + if(t_sn.classLiteral) + { + free(t_sn.classLiteral); + t_sn.classLiteral = NULL; + } + + DEBUG_WRAP(DebugMessage(DEBUG_MAPS,"\n");); + + } + else + { + if(SigLookup((SigNode *)*BcGetSigNodeHead(),t_sn.generator,t_sn.id,SOURCE_GEN_MSG,&sn) == 0) + { + if( (sn = CreateSigNode(BcGetSigNodeHead(),SOURCE_GEN_MSG)) == NULL) + { + FatalError("[%s()], CreateSigNode() returned a NULL node, bailing \n", + __FUNCTION__); + } + + memcpy(sn,&t_sn,sizeof(SigNode)); + + sn->source_file = SOURCE_GEN_MSG; + } + else + { + + DEBUG_WRAP(DebugMessage(DEBUG_MAPS, + "[%s()],Item not inserted [ gid:[%d] sid:[%d] rev:[%d] msg:[%s] class:[%d] prio:[%d] ] in signature list \n" + "\t Item already present [ gid:[%d] sid:[%d] rev:[%d] msg:[%s] class:[%d] prio:[%d] ] \n\n", + __FUNCTION__, + t_sn.generator,t_sn.id,t_sn.rev,t_sn.msg,t_sn.class_id,t_sn.priority, /* revision,class_id and priority are hardcoded for generator */ + sn->generator,sn->id,sn->rev,sn->msg,sn->class_id,sn->priority);); + + if(t_sn.msg) + { + free(t_sn.msg); + t_sn.msg = NULL; + } + + if(t_sn.classLiteral) + { + free(t_sn.classLiteral); + t_sn.classLiteral = NULL; + } + + } + } + mSplitFree(&toks, num_toks); + + return; } diff --git a/src/map.h b/src/map.h index 16d9ff8..dacd7ea 100644 --- a/src/map.h +++ b/src/map.h @@ -56,6 +56,11 @@ #define BUFFER_SIZE 1024 + +#define SOURCE_SID_MSG 0x0001 +#define SOURCE_GEN_MSG 0x0002 +#define SOURCE_GEN_RUNTIME 0x0004 + struct _Barnyard2Config; /* this contains a list of the URLs for various reference systems */ @@ -101,15 +106,17 @@ typedef struct _ClassType typedef struct _SigNode { + struct _SigNode *next; uint32_t generator; /* generator ID */ - uint32_t id; /* Snort ID */ + uint32_t id; /* Snort ID */ uint32_t rev; /* revision (for future expansion) */ uint32_t class_id; - uint32_t priority; + uint32_t priority; + u_int8_t source_file; /* where was it parsed from */ + char *classLiteral; /* sid-msg.map v2 type only */ char *msg; /* messages */ ClassType *classType; ReferenceNode *refs; /* references (eg bugtraq) */ - struct _SigNode *next; } SigNode; @@ -125,15 +132,16 @@ void DeleteClassTypes(); SigNode *GetSigByGidSid(uint32_t, uint32_t, uint32_t); -int ReadSidFile(struct _Barnyard2Config *, const char *); -void ParseSidMapLine(struct _Barnyard2Config *, char *); -int ReadGenFile(struct _Barnyard2Config *, const char *); -void ParseGenMapLine(char *); +int ReadSidFile(struct _Barnyard2Config *); +int ReadGenFile(struct _Barnyard2Config *); -void DeleteSigNodes(); +void ParseSidMapLine(struct _Barnyard2Config *, char *); +void ParseGenMapLine(char *); -SigNode *CreateSigNode(SigNode **); +void DeleteSigNodes(); +SigNode *CreateSigNode(SigNode **,u_int8_t); +int SignatureResolveClassification(ClassType *class,SigNode *sig,char *sid_map_file,char *classification_file); #endif /* __MAP_H__ */ diff --git a/src/output-plugins/spo_alert_csv.c b/src/output-plugins/spo_alert_csv.c index 66b5de9..77c76d3 100644 --- a/src/output-plugins/spo_alert_csv.c +++ b/src/output-plugins/spo_alert_csv.c @@ -533,6 +533,29 @@ static void RealAlertCSV(Packet * p, void *event, uint32_t event_type, TextLog_Print(log, "%s", tcpFlags); } } + else if(!strncasecmp("interface",type,strlen("interface"))) + { + if( barnyard2_conf->interface ) + { + TextLog_Print(log, "%s", barnyard2_conf->interface); + } + else + { + TextLog_Print(log, "%s", "by2_no_interface_configured"); + } + } + else if(!strncasecmp("hostname",type,strlen("hostname"))) + { + if( barnyard2_conf->hostname) + { + TextLog_Print(log, "%s", barnyard2_conf->hostname); + } + else + { + TextLog_Print(log, "%s", "by2_no_hostname_configured"); + } + } + DEBUG_WRAP(DebugMessage(DEBUG_LOG, "WOOT!\n");); diff --git a/src/output-plugins/spo_database.c b/src/output-plugins/spo_database.c index a97e9e5..0fd0533 100644 --- a/src/output-plugins/spo_database.c +++ b/src/output-plugins/spo_database.c @@ -344,20 +344,19 @@ u_int32_t SynchronizeEventId(DatabaseData *data) if(Select(data->SQL_SELECT,data,(u_int32_t *)&c_cid)) { - LogMessage("database: [%s()]: Problems executing [%s] \n", - __FUNCTION__, - data->SQL_SELECT); + DEBUG_WRAP(DebugMessage(DB_DEBUG,"database: [%s()]: Problems executing [%s], (there is probably no row in the table for sensor id [%d] \n", + __FUNCTION__, + data->SQL_SELECT, + data->sid);); } if(c_cid > data->cid) { - LogMessage("INFO database: Table [%s] had a more rescent cid [%u] using it. \n", - table_array[itr], - c_cid); - - LogMessage("\t Using cid [%u] instead of [%u]\n", - c_cid, - data->cid); + DEBUG_WRAP(DebugMessage(DB_DEBUG,"INFO database: Table [%s] had a more recent cid [%u], using cid [%u] instead of [%u] \n", + table_array[itr], + c_cid, + c_cid, + data->cid);); data->cid = c_cid; } @@ -1150,6 +1149,10 @@ void ParseDatabaseArgs(DatabaseData *data) { data->dbRH[data->dbtype_id].dbReconnectSleepTime.tv_sec = strtoul(a1,NULL,10); } + if(!strncasecmp(dbarg,KEYWORD_DISABLE_SIGREFTABLE,strlen(KEYWORD_DISABLE_SIGREFTABLE))) + { + data->dbRH[data->dbtype_id].disablesigref = 1; + } #ifdef ENABLE_MYSQL /* Option declared here should be forced to dbRH[DB_MYSQL] */ @@ -1441,17 +1444,20 @@ int dbProcessSignatureInformation(DatabaseData *data,void *event, u_int32_t even revision = ntohl(((Unified2EventCommon *)event)->signature_revision); priority = ntohl(((Unified2EventCommon *)event)->priority_id); classification = ntohl(((Unified2EventCommon *)event)->classification_id); - - /* Originaly forgot about this, since - those signature messages will be put in sid-msg.map by programs like pulledpork */ - /* map.c - a snort general rule (gid=1) and a snort dynamic rule (gid=3) use the - the same sids and thus can be considered one in the same. */ - if (gid == 3) + + /* + This is now only needed for backward compatible with old sid-msg.map file. + new version has gid || sid || revision || msg || etc.. + */ + if( BcSidMapVersion() == SIDMAPV1) { - gid = 1; + if (gid == 3) + { + gid = 1; + } } + /* NOTE: elz For sanity purpose the sig_class table SHOULD have internal classification id to prevent possible miss classification tagging ... but this is not happening with the old schema. @@ -2028,7 +2034,8 @@ int dbProcessEventInformation(DatabaseData *data,Packet *p, for(i=0; i < (int)(p->tcp_option_count); i++) { - if( p->tcp_options[i].len > 0) + if( (&p->tcp_options[i]) && + (p->tcp_options[i].len > 0)) { if( (SQLQueryPtr=SQL_GetNextQuery(data)) == NULL) { @@ -2228,7 +2235,8 @@ int dbProcessEventInformation(DatabaseData *data,Packet *p, { for(i=0 ; i < (int)(p->ip_option_count); i++) { - if(&p->ip_options[i]) + if( (&p->ip_options[i]) && + (p->ip_options[i].len > 0)) { if( (SQLQueryPtr=SQL_GetNextQuery(data)) == NULL) { diff --git a/src/output-plugins/spo_database.h b/src/output-plugins/spo_database.h index b68dbbd..d5e21eb 100644 --- a/src/output-plugins/spo_database.h +++ b/src/output-plugins/spo_database.h @@ -342,7 +342,8 @@ typedef struct _dbReliabilityHandle u_int8_t transactionCallFail; /* if(checkTransaction) && error set ! */ u_int8_t transactionErrorCount; /* Number of transaction fail for a single transaction (Reset by sucessfull commit)*/ u_int8_t transactionErrorThreshold; /* Consider the transaction threshold to be the same as reconnection maxiumum */ - + + u_int8_t disablesigref; /* Allow user to prevent generation and creation of signature reference table */ struct _DatabaseData *dbdata; /* Pointer to parent structure used for call clarity */ @@ -495,9 +496,9 @@ typedef struct _DatabaseData #define KEYWORD_IGNOREBPF_YES "yes" #define KEYWORD_IGNOREBPF_ONE "1" - #define KEYWORD_CONNECTION_LIMIT "connection_limit" #define KEYWORD_RECONNECT_SLEEP_TIME "reconnect_sleep_time" +#define KEYWORD_DISABLE_SIGREFTABLE "disable_signature_reference_table" #define KEYWORD_MYSQL_RECONNECT "mysql_reconnect" diff --git a/src/output-plugins/spo_database_cache.c b/src/output-plugins/spo_database_cache.c index ff29043..4e7e838 100644 --- a/src/output-plugins/spo_database_cache.c +++ b/src/output-plugins/spo_database_cache.c @@ -107,7 +107,6 @@ void MasterCacheFlush(DatabaseData *data,u_int32_t flushFlag); /* Destructor */ -extern SigNode *sigTypes; #if DEBUG @@ -530,7 +529,7 @@ u_int32_t dbReferenceLookup(dbReferenceObj *iLookup,cacheReferenceObj *iHead) if( (strncasecmp(iLookup->ref_tag,iHead->obj.ref_tag,strlen(iHead->obj.ref_tag)) == 0)) { /* Found */ - if( iHead->flag & CACHE_INTERNAL_ONLY) + if(iHead->flag & CACHE_INTERNAL_ONLY) { iHead->flag ^= (CACHE_INTERNAL_ONLY | CACHE_BOTH); } @@ -538,6 +537,7 @@ u_int32_t dbReferenceLookup(dbReferenceObj *iLookup,cacheReferenceObj *iHead) { iHead->flag ^= CACHE_BOTH; } + iHead->obj.ref_id = iLookup->ref_id; iHead->obj.system_id = iHead->obj.parent->obj.db_ref_system_id; return 1; @@ -588,6 +588,7 @@ u_int32_t dbSystemLookup(dbSystemObj *iLookup,cacheSystemObj *iHead) { iHead->flag ^= CACHE_BOTH; } + iHead->obj.db_ref_system_id = iLookup->db_ref_system_id; return 1; } @@ -2013,7 +2014,7 @@ u_int32_t SignatureLookupDatabase(DatabaseData *data,dbSignatureObj *sObj) #if DEBUG DEBUG_WRAP(DebugMessage(DB_DEBUG,"[%s()] Signature was not found in cache, looking for existance in the database:\n" - "\t if this message occur to offent, make sure your sid-msg.map and gen-msg.map file are up to date.\n" + "\t if this message occur to often, make sure your sid-msg.map and gen-msg.map file are up to date.\n" "\t Executing [%s]\n", __FUNCTION__, data->SQL_SELECT)); @@ -5186,10 +5187,13 @@ u_int32_t SignatureReferenceCacheUpdateDBid(dbSignatureReferenceObj *iDBList, cacheSignatureReferenceObj *tempCache = NULL; cacheSignatureReferenceObj *tNode = NULL; cacheSignatureReferenceObj *rNode = NULL; - dbSignatureReferenceObj *cObj = NULL; - - u_int32_t maxSeq = 0; + + u_int32_t databasemaxSeq = 0; + u_int32_t sigRefFound = 0; + u_int32_t sigSeq = 0; + u_int32_t sigRefArr[MAX_REF_OBJ] = {0}; + int x = 0; if( (iDBList == NULL) || @@ -5257,57 +5261,116 @@ u_int32_t SignatureReferenceCacheUpdateDBid(dbSignatureReferenceObj *iDBList, while(cacheLookup != NULL) { - maxSeq = 0; - - /* Look if we have colision with the databases entry*/ - /* sig_id,ref_id */ - /* if we have such collision, get Largest ref_id, bump it */ + sigRefFound = 0; + + if(sigSeq != cacheLookup->obj.db_sig_id) + { + sigSeq = cacheLookup->obj.db_sig_id; + databasemaxSeq = 0; + memset(sigRefArr,'\0',MAX_REF_OBJ); + } + if(dbSignatureReferenceLookup(&cacheLookup->obj,tempCache,&rNode,1)) { - if(cacheLookup->obj.ref_seq > rNode->obj.ref_seq) + if( (cacheLookup->obj.ref_seq != rNode->obj.ref_seq)) { - cacheLookup->obj.ref_seq = rNode->obj.ref_seq; + cacheLookup->obj.ref_seq = rNode->obj.ref_seq; + + if(cacheLookup->obj.ref_seq > MAX_REF_OBJ) + { + FatalError("[%s()], can't process reference_sequence of [%d] for signature [%d] reference [%d] \n", + __FUNCTION__, + cacheLookup->obj.ref_seq, + cacheLookup->obj.db_sig_id, + cacheLookup->obj.db_ref_id); + } + + + sigRefArr[cacheLookup->obj.ref_seq] = 1; + + if(databasemaxSeq < cacheLookup->obj.ref_seq) + { + databasemaxSeq = cacheLookup->obj.ref_seq; + } } cacheLookup->flag ^=(CACHE_BOTH | CACHE_INTERNAL_ONLY); } else { - /* Validate in internal cache */ - cCheck = *cacheHead; + /* Validate against value in database */ + cCheck = tempCache; while(cCheck != NULL) - { - if(cCheck->obj.db_sig_id == cacheLookup->obj.db_sig_id) - { - if(cCheck->obj.ref_seq > maxSeq) + { + if( (cCheck->obj.db_sig_id == cacheLookup->obj.db_sig_id) && + (cCheck->obj.db_ref_id == cacheLookup->obj.db_ref_id)) + { + + cacheLookup->obj.ref_seq = cCheck->obj.ref_seq; + + if(cacheLookup->obj.ref_seq > MAX_REF_OBJ) { - maxSeq = cCheck->obj.ref_seq; + FatalError("[%s()], can't process reference_sequence of [%d] for signature [%d] reference [%d] \n", + __FUNCTION__, + cacheLookup->obj.ref_seq, + cacheLookup->obj.db_sig_id, + cacheLookup->obj.db_ref_id); } - } - - cCheck = cCheck->next; - } - - /* Validate in temp cache */ - cCheck = tempCache; + - while(cCheck != NULL) - { - if(cCheck->obj.db_sig_id == cacheLookup->obj.db_sig_id) - { - if(cCheck->obj.ref_seq > maxSeq) - { - maxSeq = cCheck->obj.ref_seq; - } - } + sigRefArr[cacheLookup->obj.ref_seq] = 1; + sigRefFound = 1; + if(databasemaxSeq < cacheLookup->obj.ref_seq) + { + databasemaxSeq = cacheLookup->obj.ref_seq; + break; + } + } + cCheck = cCheck->next; } - cacheLookup->obj.ref_seq = maxSeq+1; - + if(!sigRefFound) + { + if(sigRefArr[cacheLookup->obj.ref_seq]) + { + cacheLookup->obj.ref_seq = (databasemaxSeq + 1); + + if(cacheLookup->obj.ref_seq > MAX_REF_OBJ) + { + FatalError("[%s()], can't process reference_sequence of [%d] for signature [%d] reference [%d] \n", + __FUNCTION__, + cacheLookup->obj.ref_seq, + cacheLookup->obj.db_sig_id, + cacheLookup->obj.db_ref_id); + } + + + databasemaxSeq = cacheLookup->obj.ref_seq; + sigRefArr[cacheLookup->obj.ref_seq] = 1; + } + else + { + if(cacheLookup->obj.ref_seq > MAX_REF_OBJ) + { + FatalError("[%s()], can't process reference_sequence of [%d] for signature [%d] reference [%d] \n", + __FUNCTION__, + cacheLookup->obj.ref_seq, + cacheLookup->obj.db_sig_id, + cacheLookup->obj.db_ref_id); + } + + sigRefArr[cacheLookup->obj.ref_seq] = 1; + + if(databasemaxSeq < cacheLookup->obj.ref_seq) + { + databasemaxSeq = cacheLookup->obj.ref_seq; + } + } + } } - + cacheLookup = cacheLookup->next; } @@ -5374,14 +5437,13 @@ u_int32_t SignatureReferencePopulateDatabase(DatabaseData *data,cacheSignatureRe data->SQL_SELECT); } - + while(cacheHead != NULL) { if(cacheHead->flag & CACHE_INTERNAL_ONLY) { row_validate = 0; - #if DEBUG inserted_sigref_object_count++; #endif @@ -5585,7 +5647,7 @@ u_int32_t ConvertDefaultCache(Barnyard2Config *bc,DatabaseData *data) return 1; } - if( (ConvertSignatureCache(&sigTypes,&data->mc,data))) + if( (ConvertSignatureCache(BcGetSigNodeHead(),&data->mc,data))) { /* XXX */ return 1; @@ -5768,13 +5830,16 @@ u_int32_t CacheSynchronize(DatabaseData *data) return 1; } - //SigRef Synchronize - if( (SigRefSynchronize(data,&data->mc.cacheSigReferenceHead,data->mc.cacheSignatureHead))) + if(!data->dbRH[data->dbtype_id].disablesigref) { - /* XXX */ - LogMessage("[%s()]: SigRefSynchronize() call failed \n", - __FUNCTION__); - return 1; + //SigRef Synchronize + if( (SigRefSynchronize(data,&data->mc.cacheSigReferenceHead,data->mc.cacheSignatureHead))) + { + /* XXX */ + LogMessage("[%s()]: SigRefSynchronize() call failed \n", + __FUNCTION__); + return 1; + } } } else diff --git a/src/output-plugins/spo_syslog_full.c b/src/output-plugins/spo_syslog_full.c index d917d0e..89ed84e 100644 --- a/src/output-plugins/spo_syslog_full.c +++ b/src/output-plugins/spo_syslog_full.c @@ -544,7 +544,7 @@ static int Syslog_FormatIPHeaderLog(OpSyslog_Data *data, Packet *p) if(IP_VER(p->iph)) ver = IP_VER(p->iph); if(IP_HLEN(p->iph)) - ver = IP_HLEN(p->iph); + hlen = IP_HLEN(p->iph) << 2; if(p->iph->ip_tos) tos = p->iph->ip_tos; if(p->iph->ip_len) diff --git a/src/parser.c b/src/parser.c index fbe048c..956e07c 100644 --- a/src/parser.c +++ b/src/parser.c @@ -179,11 +179,11 @@ static void AddVarToTable(Barnyard2Config *, char *, char *); static const KeywordFunc barnyard2_conf_keywords[] = { /* Non-rule keywords */ + { BARNYARD2_CONF_KEYWORD__VAR, KEYWORD_TYPE__MAIN, 0, ParseVar }, { BARNYARD2_CONF_KEYWORD__CONFIG, KEYWORD_TYPE__MAIN, 1, ParseConfig }, { BARNYARD2_CONF_KEYWORD__IPVAR, KEYWORD_TYPE__MAIN, 0, ParseIpVar }, { BARNYARD2_CONF_KEYWORD__INPUT, KEYWORD_TYPE__MAIN, 1, ParseInput }, { BARNYARD2_CONF_KEYWORD__OUTPUT, KEYWORD_TYPE__MAIN, 1, ParseOutput }, - { BARNYARD2_CONF_KEYWORD__VAR, KEYWORD_TYPE__MAIN, 0, ParseVar }, { NULL, 0, 0, NULL } /* Marks end of array */ }; @@ -207,6 +207,7 @@ static const ConfigFunc config_opts[] = { CONFIG_OPT__INTERFACE, 1, 1, ConfigInterface }, { CONFIG_OPT__LOG_DIR, 1, 1, ConfigLogDir }, { CONFIG_OPT__OBFUSCATE, 0, 1, ConfigObfuscate }, + { CONFIG_OPT__SIGSUPPRESS,0,0,ConfigSigSuppress}, /* XXX We can configure this on the command line - why not in config file ??? */ #ifdef NOT_UNTIL_WE_DAEMONIZE_AFTER_READING_CONFFILE { CONFIG_OPT__PID_PATH, 1, 1, ConfigPidPath }, @@ -1787,8 +1788,9 @@ void ConfigGenFile(Barnyard2Config *bc, char *args) { if ((args == NULL) || (bc == NULL) ) return; - - ReadGenFile(bc, args); + + bc->gen_msg_file = strndup(args,PATH_MAX); + return; } void ConfigHostname(Barnyard2Config *bc, char *args) @@ -1941,6 +1943,7 @@ void ConfigReference(Barnyard2Config *bc, char *args) /* 2 tokens: name */ toks = mSplit(args, " \t", 0, &num_toks, 0); + if (num_toks > 2) { ParseError("Reference config requires at most two arguments: " @@ -1949,7 +1952,7 @@ void ConfigReference(Barnyard2Config *bc, char *args) if (num_toks == 2) url = toks[1]; - + ReferenceSystemAdd(&bc->references, toks[0], url); mSplitFree(&toks, num_toks); @@ -2152,7 +2155,7 @@ void ConfigSidFile(Barnyard2Config *bc, char *args) if ((args == NULL) || (bc == NULL) ) return; - ReadSidFile(bc, args); + bc->sid_msg_file = strndup(args,PATH_MAX); } void ConfigUmask(Barnyard2Config *bc, char *args) @@ -2232,6 +2235,456 @@ void ConfigWaldoFile(Barnyard2Config *bc, char *args) bc->waldo.state |= WALDO_STATE_ENABLED; } + +void DisplaySigSuppress(SigSuppress_list **sHead) +{ + if(sHead == NULL) + { + return; + } + SigSuppress_list *cNode = *sHead; + + LogMessage("\n\n+[ Signature Suppress list ]+\n" + "----------------------------\n"); + + if(cNode) + { + while(cNode) + { + LogMessage("-- Element type:[%s] gid:[%d] sid min:[%d] sid max:[%d] \n", + (cNode->ss_type & SS_SINGLE) ? "SINGLE" : "RANGE ", + cNode->gid, + cNode->ss_min, + cNode->ss_max); + + cNode = cNode->next; + } + } + else + { + LogMessage("+[No entry in Signature Suppress List]+\n"); + } + LogMessage("----------------------------\n" + "+[ Signature Suppress list ]+\n\n"); + return; +} + +int SigSuppressUnlinkNode(SigSuppress_list **sHead,SigSuppress_list **cNode,SigSuppress_list **pNode) +{ + SigSuppress_list *nNode = NULL; + + if( ((sHead == NULL) || (*sHead == NULL)) || + ((cNode == NULL) || (*cNode == NULL)) || + ((pNode == NULL) || (*pNode == NULL))) + { + return 1; + } + + nNode =(SigSuppress_list *)(*cNode)->next; + + if( *cNode == *sHead) + { + *sHead = nNode; + free(*cNode); + *cNode = nNode; + *pNode = *cNode; + } + else + { + (*(SigSuppress_list **)(pNode))->next = nNode; + free(*cNode); + *cNode = nNode; + } + + return 0; +} + +int SigSuppressAddElement(SigSuppress_list **sHead,SigSuppress_list *sElement) +{ + SigSuppress_list *cNode = NULL; + SigSuppress_list *pNode = NULL; + SigSuppress_list *newNode = NULL; + + u_int8_t comp_set[4] = {0}; + + int has_flag = 0; + int no_add = 0; + + if( (sHead == NULL) || + (sElement == NULL)) + { + return 1; + } + + if(*sHead == NULL) + { + if( (newNode = calloc(1,sizeof(SigSuppress_list))) == NULL) + { + return 1; + } + + memcpy(newNode,sElement,sizeof(SigSuppress_list)); + *sHead = newNode; + } + else + { + cNode = *sHead; + pNode = cNode; + + has_flag = 0; + no_add = 0; + + while(cNode != NULL) + { + memset(&comp_set,'\0',(sizeof(u_int8_t)*4)); + + if( (cNode->gid == sElement->gid)) + { + switch(sElement->ss_type) + { + case SS_SINGLE: + switch(cNode->ss_type) + { + case SS_SINGLE: + if( ((cNode->ss_min == sElement->ss_min) && + (cNode->ss_max == sElement->ss_max))) + { + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS,"[%s()], Signature Suppress configuration entry type:[SINGLE] gid:[%d] sid:[%d] was not added because it is already in present.\n", + __FUNCTION__, + sElement->gid, + sElement->ss_min);); + return 0; + } + break; + + case SS_RANGE: + if( ((cNode->ss_min <= sElement->ss_min) && + (cNode->ss_max >= sElement->ss_max))) + { + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS, + "[%s()], Signature Suppress configuration entry gid:[%d] sid[%d] already covered by\n" + "Signature Suppress configuration list element type:[RANGE] gid:[%d] sid min:[%d] sid max:[%d].\n", + __FUNCTION__, + sElement->gid, + sElement->ss_min, + cNode->gid, + cNode->ss_min, + cNode->ss_max);); + return 0; + } + break; + + default: + /* XXX */ + return 1; + break; + } + break; + + case SS_RANGE: + switch(cNode->ss_type) + { + case SS_SINGLE: + if( ((sElement->ss_min <= cNode->ss_min) && + (sElement->ss_max >= cNode->ss_max))) + { + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS, + "[%s()], Signature Suppress configuration gid:[%d] sid:[%d] flagged for deletion from list,\n" + "Element is intersecting with Signature Suppress list range gid[%d] sid min:[%d] sid max:[%d]\n\n", + __FUNCTION__, + cNode->gid, + cNode->ss_min, + sElement->gid, + sElement->ss_min, + sElement->ss_max);); + cNode->flag = 1; + has_flag = 1; + } + break; + + case SS_RANGE: + if(sElement->ss_min <= cNode->ss_min) + comp_set[0] = 1; + + if(sElement->ss_min >= cNode->ss_max) + comp_set[1] = 1; + + if(sElement->ss_max >= cNode->ss_min) + comp_set[2] = 1; + + if(sElement->ss_max <= cNode->ss_max) + comp_set[3] = 1; + + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS, + "[%s()]: Comparing Signature intersection comp0:[%d] comp1:[%d] comp2:[%d] comp3:[%d]\n" + "Signature Suppress configuration entry: gid:[%d] sid min:[%d] sid max:[%d]\n" + "Signature Suppress list entry: gid:[%d] sid min:[%d] sid max:[%d]\n\n", + __FUNCTION__, + comp_set[0],comp_set[1],comp_set[2],comp_set[3], + sElement->gid,sElement->ss_min,sElement->ss_max, + cNode->gid,cNode->ss_min,cNode->ss_max);); + + if( (comp_set[0] && !comp_set[1] && comp_set[2] && comp_set[3]) || + (!comp_set[0] && !comp_set[1] && comp_set[2] && comp_set[3])) + { + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS, + "[%s()]: Signature Suppress configuration entry gid:[%d] sid min:[%d] sid max:[%d] is INCLUDED in \n" + "Signature Suppress list entry gid:[%d] sid min:[%d] sid max:[%d]\n\n", + __FUNCTION__, + sElement->gid,sElement->ss_min,sElement->ss_max, + cNode->gid,cNode->ss_min,cNode->ss_max);); + + no_add = 1; + } + else if( (comp_set[0] && comp_set[1] && !comp_set[2] && comp_set[3]) || + (!comp_set[0] && !comp_set[1] && comp_set[2] && !comp_set[3])) + { + + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS, + "[%s()]: Signature Suppress list entry gid:[%d] sid min:[%d] sid max:[%d] and\n" + "Signature Suppress configuration entry gid:[%d] sid min:[%d] sid max:[%d] share some intesection, altering list entry. \n\n", + __FUNCTION__, + cNode->gid,cNode->ss_min,cNode->ss_max, + sElement->gid,sElement->ss_min,sElement->ss_max);); + + if(sElement->ss_min <= cNode->ss_min) + { + cNode->ss_min = sElement->ss_min; + } + + if(sElement->ss_max >= cNode->ss_max) + { + cNode->ss_max = sElement->ss_max; + } + + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS, + "[%s()]: Modified Signature Suppress list entry gid:[%d] sid min:[%d] sid max:[%d] \n", + __FUNCTION__, + cNode->gid,cNode->ss_min,cNode->ss_max);); + + no_add = 1; + } + break; + + default: + FatalError("[%s()]: Unknown type[%d] for Signature Suppress configuration entry gid:[%d] sid min:[%d] max sid:[%d] \n", + __FUNCTION__, + cNode->ss_type, + cNode->gid, + cNode->ss_min, + cNode->ss_max); + return 1; + break; + + } + break; + + default: + FatalError("[%s()]: Unknown type[%d] for Signature Suppress configuration entry gid:[%d] sid min:[%d] max sid:[%d] \n", + __FUNCTION__, + sElement->ss_type, + sElement->gid, + sElement->ss_min, + sElement->ss_max); + return 1; + break; + } + } + + pNode = cNode; + cNode = cNode->next; + } + + /* We could keep an index, but rolling is way faster isin't ;) */ + if(has_flag) + { + cNode = *sHead; + pNode = cNode; + + while(cNode) + { + if(cNode->flag) + { + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS, + "[%s(), unlinking Signature Suppress list entry type:[%d] gid:[%d] sid_min:[%d] sid_max:[%d] \n", + __FUNCTION__, + cNode->ss_type, + cNode->gid, + cNode->ss_min, + cNode->ss_max);); + + if( SigSuppressUnlinkNode(sHead,&cNode,&pNode)) + { + return 1; + } + } + + if(cNode) + { + pNode = cNode; + cNode = cNode->next; + } + } + } + + if(!no_add) + { + if( (newNode = calloc(1,sizeof(SigSuppress_list))) == NULL) + { + return 1; + } + + memcpy(newNode,sElement,sizeof(SigSuppress_list)); + + pNode->next = newNode; + + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS, + "[%s()], Signature Suppress configuration entry type:[%s] gid:[%d] sid min:[%d] sid max:[%d] added to Signature Suppress list.\n", + __FUNCTION__, + (newNode->ss_type & SS_SINGLE) ? "SINGLE" : "RANGE", + newNode->gid, + newNode->ss_min, + newNode->ss_max);); + } + } + + + return 0; +} + +void ConfigSigSuppress(Barnyard2Config *bc, char *args) +{ + char **toks = NULL; + int num_toks = 0; + int ptoks = 0; + + char gid_string[256] = {0}; + + char **range_toks = NULL; + int range_num_toks = 0; + + char **gid_toks = NULL; + char *gid_sup_toks = NULL; + int gid_num_toks = 0; + + SigSuppress_list t_supp_elem = {0}; + + if( (bc == NULL) || (args == NULL)) + { + return; + } + + toks = mSplit(args, ",", 0, &num_toks, 0); + + while(ptoks < num_toks) + { + memset(gid_string,'\0',256); + + gid_toks = mSplit(toks[ptoks], ":", 2, &gid_num_toks, 0); + + if(gid_num_toks == 1) + { + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS_PARSE,"Defaulting gid 1 for toks [%s]\n", + toks[ptoks]);); + t_supp_elem.gid = 1; + gid_sup_toks = toks[ptoks]; + } + else if(gid_num_toks == 2) + { + memcpy(gid_string,gid_toks[0],strlen(gid_toks[0])); + + if( BY2Strtoul(gid_string,&t_supp_elem.gid)) + { + FatalError("[%s] \n",__FUNCTION__); + } + + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS_PARSE,"Using gid [%d] for toks [%s]\n", + t_supp_elem.gid, + toks[ptoks]);); + + gid_sup_toks = gid_toks[1]; + } + else + { + FatalError("[%s()]: Invalid gid split value for [%s]\n", + __FUNCTION__, + toks[ptoks]); + } + + range_toks = mSplit(gid_sup_toks, "-", 0, &range_num_toks, 0); + + if(range_num_toks == 1) + { + t_supp_elem.ss_type = SS_SINGLE; + + if( BY2Strtoul(gid_sup_toks,&t_supp_elem.ss_min)) + { + FatalError("[%s] \n",__FUNCTION__); + } + + t_supp_elem.ss_max = t_supp_elem.ss_min; + + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS_PARSE,"Single element gid[%d] sid[%d] \n", + t_supp_elem.gid, + t_supp_elem.ss_min);); + } + else if(range_num_toks == 2) + { + DEBUG_WRAP(DebugMessage(DEBUG_SID_SUPPRESS_PARSE,"Got range [%s] : [%s] [%s] \n", + gid_sup_toks, + range_toks[0], + range_toks[1]);); + + t_supp_elem.ss_type = SS_RANGE; + + if( BY2Strtoul(range_toks[0],&t_supp_elem.ss_min)) + { + FatalError("[%s] \n",__FUNCTION__); + } + + if( BY2Strtoul(range_toks[1],&t_supp_elem.ss_max)) + { + FatalError("[%s] \n",__FUNCTION__); + } + + if(t_supp_elem.ss_min > t_supp_elem.ss_max) + { + FatalError("[%s()], Min greater than max, invalid range [%s] \n", + __FUNCTION__, + gid_sup_toks); + } + + if(t_supp_elem.ss_min == t_supp_elem.ss_max) + { + FatalError("[%s()], Min equal than max, invalid range [%s] \n", + __FUNCTION__, + gid_sup_toks); + } + } + else + { + FatalError("element[%s] is an invalid range \n",gid_sup_toks); + } + + mSplitFree(&range_toks, range_num_toks); + mSplitFree(&gid_toks, gid_num_toks); + + if(SigSuppressAddElement(BCGetSigSuppressHead(),&t_supp_elem)) + { + FatalError("[%s()], unrecoverable call to SigSuppressAddElement() \n", + __FUNCTION__); + } + + ptoks++; + } + + mSplitFree(&toks, num_toks); + return; +} + + + + #ifdef MPLS void ConfigMaxMplsLabelChain(Barnyard2Config *bc, char *args) { diff --git a/src/parser.h b/src/parser.h index bcd70cd..6688162 100644 --- a/src/parser.h +++ b/src/parser.h @@ -76,6 +76,7 @@ #define CONFIG_OPT__UTC "utc" #define CONFIG_OPT__VERBOSE "verbose" #define CONFIG_OPT__WALDO_FILE "waldo_file" +#define CONFIG_OPT__SIGSUPPRESS "sig_suppress" #ifdef MPLS # define CONFIG_OPT__MAX_MPLS_LABELCHAIN_LEN "max_mpls_labelchain_len" # define CONFIG_OPT__MPLS_PAYLOAD_TYPE "mpls_payload_type" @@ -151,6 +152,8 @@ void ConfigSetEventCacheSize(Barnyard2Config *, char *); void ConfigMaxMplsLabelChain(Barnyard2Config *, char *); void ConfigMplsPayloadType(Barnyard2Config *, char *); #endif +void ConfigSigSuppress(Barnyard2Config *, char *); + // use this so mSplit doesn't split IP lists (try c = ';') char* FixSeparators (char* rule, char c, const char* err); diff --git a/src/plugbase.c b/src/plugbase.c index 1c59d57..1d82e27 100644 --- a/src/plugbase.c +++ b/src/plugbase.c @@ -51,6 +51,8 @@ #include "debug.h" #include "util.h" +#include "unified2.h" + /* built-in input plugins */ #include "input-plugins/spi_unified2.h" @@ -556,10 +558,75 @@ void AppendOutputFuncList(OutputFunc func, void *arg, OutputFuncNode **list) node->arg = arg; } +int pbCheckSignatureSuppression(void *event) +{ + Unified2EventCommon *uCommon = (Unified2EventCommon *)event; + SigSuppress_list **sHead = BCGetSigSuppressHead(); + SigSuppress_list *cNode = NULL; + u_int32_t gid = 0; + u_int32_t sid = 0; + + if( (uCommon == NULL) || + (sHead == NULL)) + { + return 0; + } + + cNode = *sHead; + + gid = ntohl(uCommon->generator_id); + sid = ntohl(uCommon->signature_id); + + while(cNode) + { + if(cNode->gid == gid) + { + switch(cNode->ss_type) + { + case SS_SINGLE: + if(cNode->ss_min == sid) + { + SigSuppressCount(); + return 1; + } + break; + + case SS_RANGE: + if( (cNode->ss_min >= sid) && + (cNode->ss_max <= sid)) + { + SigSuppressCount(); + return 1; + } + break; + + default: + FatalError("[%s()], Unknown Signature suppress type \n", + __FUNCTION__); + break; + } + + } + cNode = cNode->next; + } + + return 0; +} + + + void CallOutputPlugins(OutputType out_type, Packet *packet, void *event, uint32_t event_type) { OutputFuncNode *idx = NULL; + /* Plug for sid suppression */ + if(event) + { + if(pbCheckSignatureSuppression(event)) + return; + } + + if (out_type == OUTPUT_TYPE__SPECIAL) { idx = AlertList; diff --git a/src/util.c b/src/util.c index d49203d..704b5aa 100644 --- a/src/util.c +++ b/src/util.c @@ -836,13 +836,15 @@ void DropStats(int exiting) "===============================\n"); LogMessage("Record Totals:\n"); - LogMessage(" Records: " FMTu64("12") "\n", pc.total_records); - LogMessage(" Events: " FMTu64("12") " (%.3f%%)\n", pc.total_events, + LogMessage(" Records:" FMTu64("12") "\n", pc.total_records); + LogMessage(" Events:" FMTu64("12") " (%.3f%%)\n", pc.total_events, CalcPct(pc.total_events, pc.total_records)); - LogMessage(" Packets: " FMTu64("12") " (%.3f%%)\n", pc.total_packets, + LogMessage(" Packets:" FMTu64("12") " (%.3f%%)\n", pc.total_packets, CalcPct(pc.total_packets, pc.total_records)); - LogMessage(" Unknown: " FMTu64("12") " (%.3f%%)\n", pc.total_unknown, + LogMessage(" Unknown:" FMTu64("12") " (%.3f%%)\n", pc.total_unknown, CalcPct(pc.total_unknown, pc.total_records)); + LogMessage(" Suppressed:" FMTu64("12") " (%.3f%%)\n", pc.total_suppressed, + CalcPct(pc.total_suppressed, pc.total_records)); total = pc.total_packets; @@ -2262,8 +2264,8 @@ u_int32_t base64_STATIC(const u_char * xdata, int length,char *output) { int count, cols, bits, c, char_count; unsigned char alpha[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; /* 64 bytes */ - char * payloadptr; + char_count = 0; bits = 0; cols = 0; @@ -2276,7 +2278,6 @@ u_int32_t base64_STATIC(const u_char * xdata, int length,char *output) memset(output,'\0',MAX_QUERY_LENGTH); - payloadptr = output; for(count = 0; count < length; count++) { @@ -2715,3 +2716,35 @@ u_int32_t string_sanitize_character(char *input,char ichar) return 0; } + +int BY2Strtoul(char *inStr,unsigned long *ul_ptr) +{ + char *endptr = NULL; + + if( (inStr == NULL) || + (ul_ptr == NULL)) + { + return 1; + } + + *ul_ptr = strtoul(inStr,&endptr,10); + + if ((errno == ERANGE && ( *ul_ptr == LONG_MAX || *ul_ptr == LONG_MIN)) || + (errno != 0 && *ul_ptr == 0)) + { + FatalError("[%s()], strtoul error : [%s] for [%s]\n", + __FUNCTION__, + strerror(errno), + inStr); + } + + if( *endptr != '\0' || (endptr == inStr)) + { + LogMessage("[%s()], is not a digit [%s] \n", + __FUNCTION__, + inStr); + return 1; + } + + return 0; +} diff --git a/src/util.h b/src/util.h index c1d6b77..f3fb900 100644 --- a/src/util.h +++ b/src/util.h @@ -248,4 +248,5 @@ long int xatol(const char *, const char *); unsigned long int xatou(const char *, const char *); unsigned long int xatoup(const char *, const char *); // return > 0 +int BY2Strtoul(char *,unsigned long *); #endif /*__UTIL_H__*/ From 5796f03f589b302e18b31ab1f4524b13c87a206f Mon Sep 17 00:00:00 2001 From: Eric Lauzon Date: Fri, 26 Apr 2013 08:36:49 -0400 Subject: [PATCH 016/198] Last minute commit for a long waited needed feature and some little fix. Add: Support for proper signal handling. Add: README info for google mailing lists. Fixed: Compile issue when debug was enabled (missing , in some DEBUG_WRAP code. Fixed: Changed a few places where the snort literal was used instead of barnyard2 and this could confuse some first time barnyard2 users. Fixed: RPM spec file to point to good version (when needed) Bumped: Build to 326 --github specific Fixes #81 Fixes #73 Fixes #75 Close #82 Close #83 Close #80 Close #79 Close #78 Close #27 --github specific --- README | 11 + configure.in | 6 +- rpm/barnyard2.spec | 7 +- src/barnyard2.c | 549 ++++++++++++++---------- src/barnyard2.h | 171 ++++---- src/input-plugins/spi_unified2.c | 3 + src/map.c | 181 +++++--- src/map.h | 54 ++- src/output-plugins/spo_alert_cef.c | 4 + src/output-plugins/spo_alert_fast.c | 13 +- src/output-plugins/spo_alert_full.c | 11 +- src/output-plugins/spo_alert_prelude.c | 20 +- src/output-plugins/spo_alert_syslog.c | 5 + src/output-plugins/spo_alert_unixsock.c | 30 +- src/output-plugins/spo_database.c | 96 +++-- src/output-plugins/spo_log_tcpdump.c | 4 +- src/output-plugins/spo_sguil.c | 64 +-- src/output-plugins/spo_syslog_full.c | 2 + src/parser.c | 32 +- src/parser.h | 1 + src/plugbase.c | 60 ++- src/plugbase.h | 2 +- src/spooler.c | 101 ++++- src/spooler.h | 8 +- src/util.c | 15 +- 25 files changed, 943 insertions(+), 507 deletions(-) diff --git a/README b/README index 638d025..c48656f 100644 --- a/README +++ b/README @@ -158,3 +158,14 @@ Examples: # ./barnyard2 -c /etc/barnyard2.conf -o file1.u2 file2.u2 file3.u2 + +------------------------------------------------------------------------------ +4. CONTACT +------------------------------------------------------------------------------ + +You can contact the barnyard2 team and user base for question/help debugging issue concerning barnyard2 by using our mailing lists. + +barnyard2-users@googlegroups.com +AND +barnyard2-devel@googlegroups.com + diff --git a/configure.in b/configure.in index a3e757b..03b001d 100644 --- a/configure.in +++ b/configure.in @@ -1168,15 +1168,15 @@ cat <@ section of my.cnf, e.g. wait-timeout=31536000. This should give you a good year of inactivity before the server terminates the connection ... if your - network is this clean, you probably don't need to use Snort. + network is this clean, you probably don't need to use Barnyard2. ******************************************************************************** diff --git a/rpm/barnyard2.spec b/rpm/barnyard2.spec index 95e5942..983a81b 100644 --- a/rpm/barnyard2.spec +++ b/rpm/barnyard2.spec @@ -43,12 +43,13 @@ Summary: Snort Log Backend Name: barnyard2 -Version: 1.9 +Version: 1.13 +Source0: https://github.com/firnsy/barnyard2/archive/v2-%{version}.tar.gz Release: 1%{?dist} License: GPL Group: Applications/Internet -Source0: http://www.securixlive.com/download/barnyard2/%{name}-%{version}.tar.gz -Url: http://www.securixlive.com/barnyard2/ +Url: http://www.github.com/firnsy/barnyard2 + BuildRoot: %{_tmppath}/%{name}-%{version}-root %if %{libpcap1} BuildRequires: libpcap1-devel diff --git a/src/barnyard2.c b/src/barnyard2.c index 903910f..47b6ac4 100644 --- a/src/barnyard2.c +++ b/src/barnyard2.c @@ -21,17 +21,8 @@ /* * - * Program: Snort - * - * Purpose: Check out the README file for info on what you can do - * with Snort. - * - * Author: Martin Roesch (roesch@clark.net) - * - * Comments: Ideas and code stolen liberally from Mike Borella's IP Grab - * program. Check out his stuff at http://www.borella.net. I - * also have ripped some util functions from TCPdump, plus Mike's - * prog is derived from it as well. All hail TCPdump.... + * Program: barnyard2 + * Alot of code borrowed from snort. (all credit due) * */ @@ -120,11 +111,13 @@ typedef enum _GetOptArgType } GetOptArgType; - /* Globals ********************************************************************/ PacketCount pc; /* packet count information */ + +unsigned short stat_dropped = 0; uint32_t *netmasks = NULL; /* precalculated netmask array */ char **protocol_names = NULL; + char *barnyard2_conf_file = NULL; /* -c */ char *barnyard2_conf_dir = NULL; @@ -137,12 +130,10 @@ static struct timeval endtime; VarNode *cmd_line_var_list = NULL; int exit_signal = 0; -static int usr_signal = 0; +static int usr_signal = 0; static volatile int hup_signal = 0; - volatile int barnyard2_initializing = 1; -static volatile int barnyard2_exiting = 0; InputConfigFuncNode *input_config_funcs = NULL; OutputConfigFuncNode *output_config_funcs = NULL; @@ -228,22 +219,25 @@ static void InitSignals(void); #if defined(NOCOREFILE) && !defined(WIN32) static void SetNoCores(void); #endif -static void Barnyard2Cleanup(int); + +static void Barnyard2Cleanup(int,int); static void FreeInputConfigs(InputConfig *); static void FreeOutputConfigs(OutputConfig *); -static void FreeClassifications(ClassType *); -static void FreeReferences(ReferenceSystemNode *); static void FreePlugins(Barnyard2Config *); static void Barnyard2PostInit(void); static char * ConfigFileSearch(void); +int SignalCheck(void); + /* Signal handler declarations ************************************************/ + static void SigExitHandler(int); static void SigUsrHandler(int); static void SigHupHandler(int); + /* F U N C T I O N D E F I N I T I O N S **********************************/ /* @@ -261,6 +255,12 @@ static void SigHupHandler(int); */ int main(int argc, char *argv[]) { + barnyard2_argc = argc; + barnyard2_argv = argv; + + argc = 0; + argv = NULL; + #if defined(WIN32) && defined(ENABLE_WIN32_SERVICE) /* Do some sanity checking, because some people seem to forget to * put spaces between their parameters @@ -277,14 +277,11 @@ int main(int argc, char *argv[]) /* If the first parameter is "/SERVICE", then start Snort as a Win32 service */ if((argc > 1) && (_stricmp(argv[1],SERVICE_CMDLINE_PARAM) == 0)) { - return Barnyard2ServiceMain(argc, argv); + return Barnyard2ServiceMain(barnyard2_argc, barnyard2_argv); } #endif /* WIN32 && ENABLE_WIN32_SERVICE */ - - barnyard2_argc = argc; - barnyard2_argv = argv; - - return Barnyard2Main(argc, argv); + + return Barnyard2Main(barnyard2_argc, barnyard2_argv); } /* @@ -312,6 +309,8 @@ int Barnyard2Main(int argc, char *argv[]) FatalError("Could not Initialize Winsock!\n"); #endif +restart: + Barnyard2Init(argc, argv); if (BcDaemonMode()) @@ -366,16 +365,31 @@ int Barnyard2Main(int argc, char *argv[]) LogMessage("Processing %d files...\n", barnyard2_conf->batch_total_files); for(idx = 0; idx < barnyard2_conf->batch_total_files; idx++) { - ProcessBatch("", barnyard2_conf->batch_filelist[idx]); - } + ProcessBatch("", barnyard2_conf->batch_filelist[idx]); + if( SignalCheck()) + { + /* Clean Things up */ + Barnyard2Cleanup(0,0); + /* Relaunch status */ + goto restart; + } + } } } - /* Continual processing mode */ - else if (BcContinuousMode()) - { - ProcessContinuousWithWaldo(&barnyard2_conf->waldo); + /* Continual processing mode */ + else if (BcContinuousMode()) + { + ProcessContinuousWithWaldo(&barnyard2_conf->waldo); + + if( SignalCheck()) + { + /* Clean Things up */ + Barnyard2Cleanup(0,0); + /* Relaunch status */ + goto restart; } - + } + #ifndef WIN32 closelog(); #endif @@ -564,7 +578,7 @@ static void ParseCmdLine(int argc, char **argv) FatalError("%s(%d) Trying to parse the command line again.\n", __FILE__, __LINE__); } - + barnyard2_cmd_line_conf = Barnyard2ConfNew(); barnyard2_conf = barnyard2_cmd_line_conf; /* Set the global for log messages */ bc = barnyard2_cmd_line_conf; @@ -622,6 +636,7 @@ static void ParseCmdLine(int argc, char **argv) ** Instead, we check optopt and it will tell us. */ optopt = 0; + optind = 0; /* in case we are being re-invoked , think HUP */ /* loop through each command line var and process it */ while ((ch = getopt_long(argc, argv, valid_options, long_options, &option_index)) != -1) @@ -857,27 +872,27 @@ static void ParseCmdLine(int argc, char **argv) } } - /* when batch processing check for any remaining arguments which should */ - /* be a parsed as a list of files to process. */ - if ((bc->run_mode_flags & RUN_MODE_FLAG__BATCH) && (optind < argc)) + /* when batch processing check for any remaining arguments which should */ + /* be a parsed as a list of files to process. */ + if ((bc->run_mode_flags & RUN_MODE_FLAG__BATCH) && (optind < argc)) + { + int idx = 0; + + bc->batch_total_files = argc - optind; + bc->batch_filelist = SnortAlloc(bc->batch_total_files * sizeof(char *)); + + while (optind < argc) { - int idx = 0; - - bc->batch_total_files = argc - optind; - bc->batch_filelist = SnortAlloc(bc->batch_total_files * sizeof(char *)); - - while (optind < argc) - { - DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Extra args: %s\n", argv[optind]);); - bc->batch_filelist[idx] = SnortStrdup(argv[optind]); - - idx++; - optind++; - } - - DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Total files: %i\n", bc->batch_total_files);); + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Extra args: %s\n", argv[optind]);); + bc->batch_filelist[idx] = SnortStrdup(argv[optind]); + + idx++; + optind++; } - + + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "Total files: %i\n", bc->batch_total_files);); + } + if ((bc->run_mode_flags & RUN_MODE_FLAG__TEST) && (bc->run_flags & RUN_FLAG__DAEMON)) { @@ -886,12 +901,12 @@ static void ParseCmdLine(int argc, char **argv) "mode and then restart in daemon mode.\n"); } else if ((bc->run_mode_flags & RUN_MODE_FLAG__BATCH) && - (bc->run_flags & RUN_MODE_FLAG__CONTINUOUS)) + (bc->run_flags & RUN_MODE_FLAG__CONTINUOUS)) { FatalError("Cannot use batch mode and continuous mode together.\n"); } - - + + if ((bc->run_mode_flags & RUN_MODE_FLAG__TEST) && (barnyard2_conf_file == NULL)) { @@ -899,10 +914,10 @@ static void ParseCmdLine(int argc, char **argv) "file. Use the '-c' option on the command line to " "specify a configuration file.\n"); } - + if (pcap_filter != NULL) free(pcap_filter); - + /* Set the run mode based on what we've got from command line */ /* Version overrides all */ @@ -1011,36 +1026,32 @@ static void SigExitHandler(int signal) if (exit_signal != 0) return; - - - /* Don't want to have to wait to start processing packets before - * getting out of dodge */ if (barnyard2_initializing) _exit(0); - + exit_signal = signal; - - Barnyard2Cleanup(signal); - + return; } static void SigUsrHandler(int signal) { - if (usr_signal != 0) + if ( (usr_signal != 0) || + (exit_signal != 0)) return; - + usr_signal = signal; - - Barnyard2Cleanup(signal); - - + return; } static void SigHupHandler(int signal) { + if(exit_signal != 0) + return; + + exit_signal = 1; hup_signal = 1; - Barnyard2Cleanup(signal); - + + return; } /**************************************************************************** @@ -1056,56 +1067,70 @@ static void SigHupHandler(int signal) ****************************************************************************/ void CleanExit(int exit_val) { - LogMessage("Snort exiting\n"); - Barnyard2Cleanup(exit_val); + LogMessage("Barnyard2 exiting\n"); + #ifndef WIN32 closelog(); #endif - exit(exit_val); + + Barnyard2Cleanup(exit_val,1); } -static void Barnyard2Cleanup(int exit_val) + +static void Barnyard2Cleanup(int exit_val,int exit_needed) { PluginSignalFuncNode *idxPlugin = NULL; + PluginSignalFuncNode *idxPluginNext = NULL; - /* This function can be called more than once. For example, - * once from the SIGINT signal handler, and once recursively - * as a result of calling pcap_close() below. We only need - * to perform the cleanup once, however. So the static - * variable already_exiting will act as a flag to prevent - * double-freeing any memory. Not guaranteed to be - * thread-safe, but it will prevent the simple cases. - */ + /* This function can be called more than once. */ static int already_exiting = 0; + if( already_exiting != 0 ) { return; } + already_exiting = 1; - barnyard2_exiting = 1; + barnyard2_initializing = 0; /* just in case we cut out early */ - + if (BcContinuousMode() || BcBatchMode()) { /* Do some post processing on any incomplete Plugin Data */ idxPlugin = plugin_shutdown_funcs; while(idxPlugin) { + idxPluginNext = idxPlugin->next; idxPlugin->func(SIGQUIT, idxPlugin->arg); - idxPlugin = idxPlugin->next; + free(idxPlugin); + idxPlugin = idxPluginNext; + } + plugin_shutdown_funcs = NULL; + + /* + Right now we will just free them if they are initialized since + in the context we operate if we receive HUP we mainly just "restart" + */ + idxPlugin = plugin_restart_funcs; + while(idxPlugin) + { + idxPluginNext = idxPlugin->next; + free(idxPlugin); + idxPlugin = idxPluginNext; } + plugin_restart_funcs = NULL; } - + if (!exit_val) { struct timeval difftime; struct timezone tz; - + memset((char *) &tz, 0, sizeof(tz)); /* bzero() deprecated, replaced by memset() */ gettimeofday(&endtime, &tz); - + TIMERSUB(&endtime, &starttime, &difftime); - + if (exit_signal) { LogMessage("Run time prior to being shutdown was %lu.%lu seconds\n", @@ -1120,34 +1145,75 @@ static void Barnyard2Cleanup(int exit_val) idxPlugin = plugin_clean_exit_funcs; while(idxPlugin) { + idxPluginNext = idxPlugin->next; idxPlugin->func(SIGQUIT, idxPlugin->arg); - idxPlugin = idxPlugin->next; + free(idxPlugin); + idxPlugin = idxPluginNext; } + plugin_clean_exit_funcs = NULL; } /* Print Statistics */ - if (!BcTestMode() && !BcVersionMode() - ) + if (!BcTestMode() && !BcVersionMode()) { - DropStats(2); + if(!stat_dropped) + { + DropStats(2); + } + else + { + stat_dropped = 0; + } } - CleanupProtoNames(); + /* Cleanup some spooler stuff */ + if(barnyard2_conf->spooler) + { + spoolerEventCacheFlush(barnyard2_conf->spooler); + + if(barnyard2_conf->spooler->header) + { + free(barnyard2_conf->spooler->header); + barnyard2_conf->spooler->header = NULL; + } - ClosePidFile(); + if(barnyard2_conf->spooler->record.header) + { + free(barnyard2_conf->spooler->record.header); + barnyard2_conf->spooler->record.header = NULL; + } + if(barnyard2_conf->spooler->record.data) + { + free(barnyard2_conf->spooler->record.data); + barnyard2_conf->spooler->record.data = NULL; + } + } + + CleanupProtoNames(); + ClosePidFile(); + /* remove pid file */ if (SnortStrnlen(barnyard2_conf->pid_filename, sizeof(barnyard2_conf->pid_filename)) > 0) { int ret; ret = unlink(barnyard2_conf->pid_filename); - + if (ret != 0) { ErrorMessage("Could not remove pid file %s: %s\n", barnyard2_conf->pid_filename, strerror(errno)); } } + + spoolerCloseWaldo(&barnyard2_conf->waldo); + + if(barnyard2_conf->spooler) + { + spoolerClose(barnyard2_conf->spooler); + barnyard2_conf->spooler = NULL; + } + /* free allocated memory */ if (barnyard2_conf == barnyard2_cmd_line_conf) @@ -1164,49 +1230,44 @@ static void Barnyard2Cleanup(int exit_val) barnyard2_conf = NULL; } - FreeOutputConfigFuncs(); FreeOutputList(AlertList); + FreeOutputList(LogList); AlertList = NULL; - - FreeOutputList(LogList); LogList = NULL; + FreeOutputConfigFuncs(); + + FreeInputPlugins(); + /* Global lists */ ParserCleanup(); - + /* Stuff from plugbase */ - ClearDumpBuf(); - + if (netmasks != NULL) { free(netmasks); netmasks = NULL; } - - if (protocol_names != NULL) - { - int i; - - for (i = 0; i < NUM_IP_PROTOS; i++) - { - if (protocol_names[i] != NULL) - free(protocol_names[i]); - } - - free(protocol_names); - protocol_names = NULL; - } - + if (barnyard2_conf_file != NULL) + { free(barnyard2_conf_file); - + barnyard2_conf_file = NULL; + } + if (barnyard2_conf_dir != NULL) + { free(barnyard2_conf_dir); - + barnyard2_conf_dir = NULL; + } - _exit(exit_val); + if(exit_needed) + _exit(exit_val); + already_exiting = 0; + return; } void Restart(void) @@ -1225,7 +1286,7 @@ void Restart(void) LogMessage("\n"); LogMessage("***** Restarting Barnyard2 *****\n"); LogMessage("\n"); - Barnyard2Cleanup(0); + Barnyard2Cleanup(0,0); if (daemon_mode) { @@ -1263,6 +1324,7 @@ void Restart(void) exit(-1); } + /* * Check for signal activity */ @@ -1270,67 +1332,85 @@ int SignalCheck(void) { switch (exit_signal) { - case SIGTERM: - if (!exit_logged) - { - ErrorMessage("*** Caught Term-Signal\n"); - exit_logged = 1; - } - CleanExit(0); - break; - - case SIGINT: - if (!exit_logged) - { - ErrorMessage("*** Caught Int-Signal\n"); - exit_logged = 1; - } - CleanExit(0); - break; - case SIGQUIT: - if (!exit_logged) - { - ErrorMessage("*** Caught Quit-Signal\n"); - exit_logged = 1; - } - CleanExit(0); - break; + case SIGTERM: + if (!exit_logged) + { + ErrorMessage("*** Caught Term-Signal\n"); + exit_logged = 1; + } + + CleanExit(exit_signal); + break; + + case SIGINT: + if (!exit_logged) + { + ErrorMessage("*** Caught Int-Signal\n"); + exit_logged = 1; + } + + CleanExit(exit_signal); + break; + + case SIGQUIT: + if (!exit_logged) + { + ErrorMessage("*** Caught Quit-Signal\n"); + exit_logged = 1; + } + + CleanExit(exit_signal); + break; + + case SIGKILL: + if (!exit_logged) + { + ErrorMessage("*** Caught Kill-Signal\n"); + exit_logged = 1; + } + + CleanExit(exit_signal); + break; - default: - break; + default: + break; } - + exit_signal = 0; - + switch (usr_signal) { - case SIGUSR1: - ErrorMessage("*** Caught Usr-Signal\n"); - DropStats(0); - break; - - case SIGNAL_SNORT_ROTATE_STATS: - ErrorMessage("*** Caught Usr-Signal: 'Rotate Stats'\n"); - break; + case SIGUSR1: + ErrorMessage("*** Caught Usr-Signal\n"); + DropStats(0); + break; + + case SIGNAL_SNORT_ROTATE_STATS: + ErrorMessage("*** Caught Usr-Signal: 'Rotate Stats'\n"); + break; } - + usr_signal = 0; - + if (hup_signal) { ErrorMessage("*** Caught Hup-Signal\n"); + DropStats(0); + stat_dropped = 1; + ErrorMessage("*** Resetting Stats\n"); + memset(&pc,'\0',sizeof(PacketCount)); hup_signal = 0; return 1; } - + return 0; } + static void InitGlobals(void) { memset(&pc, 0, sizeof(PacketCount)); - InitNetmasks(); InitProtoNames(); } @@ -1359,41 +1439,110 @@ void Barnyard2ConfFree(Barnyard2Config *bc) { if (bc == NULL) return; - + if (bc->log_dir != NULL) + { free(bc->log_dir); - + bc->log_dir = NULL; + } + if (bc->orig_log_dir != NULL) + { free(bc->orig_log_dir); - + bc->orig_log_dir = NULL; + } + if (bc->interface != NULL) + { free(bc->interface); - + bc->interface = NULL; + } + if (bc->chroot_dir != NULL) + { free(bc->chroot_dir); - + bc->chroot_dir = NULL; + } + if (bc->archive_dir != NULL) + { free(bc->archive_dir); + bc->archive_dir = NULL; + } + + if(bc->config_file != NULL) + { + free(bc->config_file); + bc->config_file = NULL; + } + + if(bc->config_dir != NULL) + { + free(bc->config_dir); + bc->config_dir = NULL; + } + + if(bc->hostname != NULL) + { + free(bc->hostname); + bc->hostname = NULL; + } + + if(bc->class_file != NULL) + { + free(bc->class_file); + bc->class_file = NULL; + } + + if( bc->sid_msg_file != NULL) + { + free(bc->sid_msg_file); + bc->sid_msg_file = NULL; + } - if (bc->batch_total_files > 0) + if( bc->gen_msg_file != NULL) + { + free(bc->gen_msg_file); + bc->gen_msg_file = NULL; + } + + if( bc->reference_file != NULL) + { + free(bc->reference_file); + bc->reference_file = NULL; + } + + if( bc->bpf_filter != NULL) + { + free(bc->bpf_filter); + bc->bpf_filter = NULL; + } + + if (bc->batch_total_files > 0) + { + int idx; + for(idx = 0; idx< bc->batch_total_files; idx++) { - int idx; - for(idx = 0; idx< bc->batch_total_files; idx++) - { - free(bc->batch_filelist[idx]); - } - free(bc->batch_filelist); + free(bc->batch_filelist[idx]); + bc->batch_filelist[idx] = NULL; } + free(bc->batch_filelist); + } + FreeSigSuppression(&bc->ssHead); + FreeSigNodes(&bc->sigHead); + FreeClassifications(&bc->classifications); + FreeReferences(&bc->references); + FreeInputConfigs(bc->input_configs); + bc->input_configs = NULL; + FreeOutputConfigs(bc->output_configs); - - FreeClassifications(bc->classifications); - FreeReferences(bc->references); - + bc->output_configs = NULL; + VarTablesFree(bc); FreePlugins(bc); - + free(bc); } @@ -1522,7 +1671,7 @@ static void FreePlugins(Barnyard2Config *bc) { if (bc == NULL) return; - + FreePluginSigFuncs(bc->plugin_post_config_funcs); bc->plugin_post_config_funcs = NULL; } @@ -2033,39 +2182,3 @@ static void FreeOutputConfigs(OutputConfig *head) } } -static void FreeClassifications(ClassType *head) -{ - while (head != NULL) - { - ClassType *tmp = head; - - head = head->next; - - if (tmp->name != NULL) - free(tmp->name); - - if (tmp->type != NULL) - free(tmp->type); - - free(tmp); - } -} - -static void FreeReferences(ReferenceSystemNode *head) -{ - while (head != NULL) - { - ReferenceSystemNode *tmp = head; - - head = head->next; - - if (tmp->name != NULL) - free(tmp->name); - - if (tmp->url != NULL) - free(tmp->url); - - free(tmp); - } -} - diff --git a/src/barnyard2.h b/src/barnyard2.h index 91c00f8..17cb431 100644 --- a/src/barnyard2.h +++ b/src/barnyard2.h @@ -63,7 +63,7 @@ #define VER_MAJOR "2" #define VER_MINOR "1" #define VER_REVISION "13-BETA" -#define VER_BUILD "325" +#define VER_BUILD "326" #define STD_BUF 1024 @@ -306,93 +306,48 @@ typedef struct _VarNode } VarNode; -#define SS_SINGLE 0x0001 -#define SS_RANGE 0x0002 - -typedef struct _SigSuppress_list -{ - u_int8_t ss_type; /* Single or Range */ - u_int8_t flag; /* Flagged for deletion */ - unsigned long gid; /* Generator id */ - unsigned long ss_min; /* VAL for SS_SINGLE, MIN VAL for RANGE */ - unsigned long ss_max; /* VAL for SS_SINGLE, MAX VAL for RANGE */ - struct _SigSuppress_list *next; -} SigSuppress_list; - /* struct to contain the program variables and command line args */ typedef struct _Barnyard2Config { +/* Does not need cleanup */ RunMode run_mode; + int checksums_mode; + char ignore_ports[0x10000]; int run_mode_flags; int run_flags; int output_flags; int logging_flags; - - unsigned int event_cache_size; - - VarEntry *var_table; -#ifdef SUP_IP6 - vartable_t *ip_vartable; -#endif - - /* staging - snort specific variables */ - int checksums_mode; - char ignore_ports[0x10000]; - - /* general variables */ - char *config_file; /* -c */ - char *config_dir; + int thiszone; + int quiet_flag; + int verbose_flag; + int verbose_bytedump_flag; + int show2hdr_flag; + int char_data_flag; + int data_flag; + int obfuscation_flag; + int alert_on_each_packet_in_stream_flag; - char *hostname; /* -h or config hostname */ - char *interface; /* -i or config interface */ - - char *class_file; /* -C or config class_map */ - char *sid_msg_file; /* -S or config sid_map */ - short sidmap_version; /* Set by ReadSidFile () */ - char *gen_msg_file; /* -G or config gen_map */ - - char *reference_file; /* -R or config reference_map */ - char *log_dir; /* -l or config log_dir */ - char *orig_log_dir; /* set in case of chroot */ - char *chroot_dir; /* -t or config chroot */ - uint8_t verbose; /* -v */ - uint8_t localtime; - char *bpf_filter; /* config bpf_filter */ - - int thiszone; - - int quiet_flag; - int verbose_flag; - int verbose_bytedump_flag; - int show2hdr_flag; - int char_data_flag; - int data_flag; - int obfuscation_flag; - int alert_on_each_packet_in_stream_flag; + int logtosyslog_flag; + int test_mode_flag; - int logtosyslog_flag; - int test_mode_flag; + int use_utc; + int include_year; - int use_utc; - int include_year; - - int line_buffer_flag; - char nostamp; - - - int user_id; - int group_id; - mode_t file_mask; + int line_buffer_flag; + char nostamp; + int user_id; + int group_id; + mode_t file_mask; /* -h and -B */ #ifdef SUP_IP6 - sfip_t homenet; - sfip_t obfuscation_net; + sfip_t homenet; + sfip_t obfuscation_net; #else - u_long homenet; - u_long netmask; - uint32_t obfuscation_net; - uint32_t obfuscation_mask; + u_long homenet; + u_long netmask; + uint32_t obfuscation_net; + uint32_t obfuscation_mask; #endif #ifdef MPLS @@ -400,44 +355,70 @@ typedef struct _Barnyard2Config long int mpls_stack_depth; /* --max_mpls_labelchain_len */ #endif - /* batch mode options */ - int batch_mode_flag; - int batch_total_files; - char **batch_filelist; + /* batch mode options */ + int batch_mode_flag; + int batch_total_files; + /* continual mode options */ - int process_new_records_only_flag; - Waldo waldo; - char *archive_dir; - int daemon_flag; - int daemon_restart_flag; + int process_new_records_only_flag; + Waldo waldo; + + int daemon_flag; + int daemon_restart_flag; /* runtime parameters */ char pid_filename[STD_BUF]; char pid_path[STD_BUF]; /* --pid-path or config pidpath */ - - char pidfile_suffix[MAX_PIDFILE_SUFFIX+1]; /* room for a null */ char create_pid_file; char nolock_pid_file; - int done_processing; + int done_processing; int restart_flag; int print_version; int usr_signal; int cant_hup_signal; - - SigSuppress_list *ssHead; + unsigned int event_cache_size; + uint8_t verbose; /* -v */ + uint8_t localtime; +/* Need to be handled by Barnyard2ConfFree() */ + + VarEntry *var_table; +#ifdef SUP_IP6 + vartable_t *ip_vartable; +#endif + SigSuppress_list *ssHead; + ClassType *classifications; ReferenceSystemNode *references; - SigNode *sigHead; /* Signature list Head */ - + /* plugin active flags*/ - InputConfig *input_configs; - OutputConfig *output_configs; - + InputConfig *input_configs; + OutputConfig *output_configs; PluginSignalFuncNode *plugin_post_config_funcs; + + char *config_file; /* -c */ + char *config_dir; + char *hostname; /* -h or config hostname */ + char *interface; /* -i or config interface */ + + char *class_file; /* -C or config class_map */ + char *sid_msg_file; /* -S or config sid_map */ + short sidmap_version; /* Set by ReadSidFile () */ + char *gen_msg_file; /* -G or config gen_map */ + + char *reference_file; /* -R or config reference_map */ + char *log_dir; /* -l or config log_dir */ + char *orig_log_dir; /* set in case of chroot */ + char *chroot_dir; /* -t or config chroot */ + + char *bpf_filter; /* config bpf_filter */ + char **batch_filelist; + char *archive_dir; + + Spooler *spooler; /* Used to know if we need to call spoolerClose */ } Barnyard2Config; @@ -589,16 +570,20 @@ extern int exit_signal; extern Barnyard2Config *barnyard2_conf_for_parsing; /* P R O T O T Y P E S ******************************************************/ +Barnyard2Config * Barnyard2ConfNew(void); + int Barnyard2Main(int argc, char *argv[]); int Barnyard2Sleep(unsigned int); +int SignalCheck(void); + void CleanExit(int); void SigCantHupHandler(int signal); void FreeVarList(VarNode *); -Barnyard2Config * Barnyard2ConfNew(void); void Barnyard2ConfFree(Barnyard2Config *); void CleanupPreprocessors(Barnyard2Config *); void CleanupPlugins(Barnyard2Config *); + static INLINE int BcTestMode(void) { return barnyard2_conf->run_mode == RUN_MODE__TEST; diff --git a/src/input-plugins/spi_unified2.c b/src/input-plugins/spi_unified2.c index db1d08b..945289b 100644 --- a/src/input-plugins/spi_unified2.c +++ b/src/input-plugins/spi_unified2.c @@ -236,13 +236,16 @@ int Unified2ReadRecord(void *sph) void Unified2CleanExitFunc(int signal, void *arg) { DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Unified2CleanExitFunc\n");); + return; } void Unified2RestartFunc(int signal, void *arg) { DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Unified2RestartFunc\n");); + return; } + #ifdef DEBUG void Unified2PrintEventCommonRecord(Unified2EventCommon *evt) { diff --git a/src/map.c b/src/map.c index 758e93f..034da34 100644 --- a/src/map.c +++ b/src/map.c @@ -480,7 +480,7 @@ int ReadClassificationFile(Barnyard2Config *bc, const char *file) return -1; } - + bc->class_file =(char *)file; memset(buf, 0, BUFFER_SIZE); /* bzero() deprecated, replaced with memset() */ @@ -511,6 +511,8 @@ int ReadClassificationFile(Barnyard2Config *bc, const char *file) if(fd != NULL) fclose(fd); + bc->class_file = NULL; + return 0; } @@ -584,7 +586,8 @@ int SignatureResolveClassification(ClassType *class,SigNode *sig,char *sid_msg_f if(sig->class_id == 0) { - DEBUG_WRAP(DebugMessage(DEBUG_MAPS"\nINFO: [%s()],In file [%s]\n" + DEBUG_WRAP(DebugMessage(DEBUG_MAPS, + "\nINFO: [%s()],In file [%s]\n" "Signature [gid: %d] [sid : %d] [revision: %d] message [%s] has no classification literal defined, signature priority is [%d]\n\n", __FUNCTION__, BcGetSourceFile(sig->source_file), @@ -606,7 +609,8 @@ int SignatureResolveClassification(ClassType *class,SigNode *sig,char *sid_msg_f if( (found) && (found->priority != sig->priority)) { - DEBUG_WRAP(DebugMessage(DEBUG_MAPS"\nINFO: [%s()],In file [%s]\n" + DEBUG_WRAP(DebugMessage(DEBUG_MAPS, + "\nINFO: [%s()],In file [%s]\n" "Signature [gid: %d] [sid : %d] [revision: %d] message [%s] has classification [%s] priority [%d]\n" "The priority define by the rule will overwride classification [%s] priority [%d] defined in [%s] using [%d] as priority \n\n", __FUNCTION__, @@ -743,59 +747,7 @@ int ReadSidFile(Barnyard2Config *bc) return 0; } -void DeleteSigNodes() -{ - SigNode *sn = NULL, *snn = NULL; - SigNode **sigHead = NULL; - - ReferenceNode *rn = NULL, *rnn = NULL; - sigHead = BcGetSigNodeHead(); - sn = *sigHead; - - while(sn != NULL) - { - snn = sn->next; - - /* free the message */ - if(sn->msg) - { - free(sn->msg); - } - - /* free the references (NOT the reference systems) */ - if(sn->refs) - { - rn = sn->refs; - while(rn != NULL) - { - rnn = rn->next; - - /* free the id */ - if(rn->id) - free(rn->id); - - /* free the reference node */ - free(rn); - - rn = rnn; - } - } - - /* free the signature node */ - free(sn); - sn = NULL; - sn = snn; - } - - if(*sigHead != NULL) - { - free(*sigHead); - *sigHead = NULL; - } - - return; -} void ParseSidMapLine(Barnyard2Config *bc, char *data) { @@ -1284,3 +1236,122 @@ void ParseGenMapLine(char *data) return; } + +/* + * Some destructors + * + * + */ + +void FreeSigNodes(SigNode **sigHead) +{ + SigNode *sn = NULL, *snn = NULL; + ReferenceNode *rn = NULL, *rnn = NULL; + sn = *sigHead; + + while(sn != NULL) + { + snn = sn->next; + + /* free the message */ + if(sn->msg) + { + free(sn->msg); + sn->msg = NULL; + } + + if(sn->classLiteral) + { + free(sn->classLiteral); + sn->classLiteral = NULL; + } + + /* free the references (NOT the reference systems) */ + if(sn->refs) + { + rn = sn->refs; + while(rn != NULL) + { + rnn = rn->next; + + /* free the id */ + if(rn->id) + free(rn->id); + + /* free the reference node */ + free(rn); + + rn = rnn; + } + } + + /* free the signature node */ + free(sn); + sn = NULL; + sn = snn; + } + + *sigHead = NULL; + + return; +} + +void FreeClassifications(ClassType **i_head) +{ + ClassType *head = *i_head; + + while (head != NULL) + { + ClassType *tmp = head; + + head = head->next; + + if (tmp->name != NULL) + free(tmp->name); + + if (tmp->type != NULL) + free(tmp->type); + + free(tmp); + } + + *i_head = NULL; +} + + +void FreeReferences(ReferenceSystemNode **i_head) +{ + ReferenceSystemNode *head = *i_head; + + while (head != NULL) + { + ReferenceSystemNode *tmp = head; + + head = head->next; + + if (tmp->name != NULL) + free(tmp->name); + + if (tmp->url != NULL) + free(tmp->url); + + free(tmp); + } + + *i_head = NULL; +} + +void FreeSigSuppression(SigSuppress_list **i_head) +{ + SigSuppress_list *head = *i_head; + + while(head != NULL) + { + SigSuppress_list *next = head->next; + + free(head); + head = next; + } + + *i_head = NULL; +} diff --git a/src/map.h b/src/map.h index dacd7ea..fd7c820 100644 --- a/src/map.h +++ b/src/map.h @@ -44,7 +44,6 @@ #include #include - #include "sf_types.h" #define BUGTRAQ_URL_HEAD "http://www.securityfocus.com/bid/" @@ -72,15 +71,6 @@ typedef struct _ReferenceSystemNode } ReferenceSystemNode; -ReferenceSystemNode * ReferenceSystemAdd(ReferenceSystemNode **, char *, char *); -ReferenceSystemNode * ReferenceSystemLookup(ReferenceSystemNode *, char *); - -int ReadReferenceFile(struct _Barnyard2Config *, const char *); -void ParseReferenceSystemConfig(struct _Barnyard2Config *, char *args); - -void DeleteReferenceSystems(struct _Barnyard2Config *); - - typedef struct _ReferenceNode { char *id; @@ -88,9 +78,6 @@ typedef struct _ReferenceNode struct _ReferenceNode *next; } ReferenceNode; -ReferenceNode * AddReference(struct _Barnyard2Config *, ReferenceNode **, char *, char *); -void DeleteReferences(struct _Barnyard2Config *); - typedef struct _ClassType { @@ -103,7 +90,6 @@ typedef struct _ClassType } ClassType; - typedef struct _SigNode { struct _SigNode *next; @@ -115,33 +101,55 @@ typedef struct _SigNode u_int8_t source_file; /* where was it parsed from */ char *classLiteral; /* sid-msg.map v2 type only */ char *msg; /* messages */ - ClassType *classType; ReferenceNode *refs; /* references (eg bugtraq) */ } SigNode; +#define SS_SINGLE 0x0001 +#define SS_RANGE 0x0002 + +typedef struct _SigSuppress_list +{ + u_int8_t ss_type; /* Single or Range */ + u_int8_t flag; /* Flagged for deletion */ + unsigned long gid; /* Generator id */ + unsigned long ss_min; /* VAL for SS_SINGLE, MIN VAL for RANGE */ + unsigned long ss_max; /* VAL for SS_SINGLE, MAX VAL for RANGE */ + struct _SigSuppress_list *next; +} SigSuppress_list; -ClassType * ClassTypeLookupByType(struct _Barnyard2Config *, char *); -ClassType * ClassTypeLookupById(struct _Barnyard2Config *, int); -int ReadClassificationFile(struct _Barnyard2Config *, const char *); -void ParseClassificationConfig(struct _Barnyard2Config *, char *args); -void DeleteClassTypes(); +ReferenceSystemNode * ReferenceSystemAdd(ReferenceSystemNode **, char *, char *); +ReferenceSystemNode * ReferenceSystemLookup(ReferenceSystemNode *, char *); +ReferenceNode * AddReference(struct _Barnyard2Config *, ReferenceNode **, char *, char *); SigNode *GetSigByGidSid(uint32_t, uint32_t, uint32_t); +SigNode *CreateSigNode(SigNode **,u_int8_t); +ClassType * ClassTypeLookupByType(struct _Barnyard2Config *, char *); +ClassType * ClassTypeLookupById(struct _Barnyard2Config *, int); +int ReadReferenceFile(struct _Barnyard2Config *, const char *); +int ReadClassificationFile(struct _Barnyard2Config *, const char *); int ReadSidFile(struct _Barnyard2Config *); int ReadGenFile(struct _Barnyard2Config *); +int SignatureResolveClassification(ClassType *class,SigNode *sig,char *sid_map_file,char *classification_file); + +void DeleteReferenceSystems(struct _Barnyard2Config *); +void DeleteReferences(struct _Barnyard2Config *); +void ParseReferenceSystemConfig(struct _Barnyard2Config *, char *args); +void ParseClassificationConfig(struct _Barnyard2Config *, char *args); void ParseSidMapLine(struct _Barnyard2Config *, char *); void ParseGenMapLine(char *); +/* Destructors */ +void FreeSigNodes(SigNode **); +void FreeClassifications(ClassType **); +void FreeReferences(ReferenceSystemNode **); +void FreeSigSuppression(SigSuppress_list **); -void DeleteSigNodes(); -SigNode *CreateSigNode(SigNode **,u_int8_t); -int SignatureResolveClassification(ClassType *class,SigNode *sig,char *sid_map_file,char *classification_file); #endif /* __MAP_H__ */ diff --git a/src/output-plugins/spo_alert_cef.c b/src/output-plugins/spo_alert_cef.c index 566919b..003e474 100644 --- a/src/output-plugins/spo_alert_cef.c +++ b/src/output-plugins/spo_alert_cef.c @@ -572,6 +572,8 @@ void AlertCEFCleanExit(int signal, void *arg) /* free memory from SyslogData */ if(data) free(data); + + closelog(); } void AlertCEFRestart(int signal, void *arg) @@ -581,5 +583,7 @@ void AlertCEFRestart(int signal, void *arg) /* free memory from SyslogData */ if(data) free(data); + + closelog(); } diff --git a/src/output-plugins/spo_alert_fast.c b/src/output-plugins/spo_alert_fast.c index 7512a33..e0a3735 100644 --- a/src/output-plugins/spo_alert_fast.c +++ b/src/output-plugins/spo_alert_fast.c @@ -408,10 +408,17 @@ static void AlertFastCleanup(int signal, void *arg, const char* msg) { SpoAlertFastData *data = (SpoAlertFastData *)arg; DEBUG_WRAP(DebugMessage(DEBUG_LOG, "%s\n", msg);); - + /*free memory from SpoAlertFastData */ - if ( data->log ) TextLog_Term(data->log); - free(data); + if ( data->log ) + { + TextLog_Term(data->log); + } + + if(data) + free(data); + + return; } static void AlertFastCleanExitFunc(int signal, void *arg) diff --git a/src/output-plugins/spo_alert_full.c b/src/output-plugins/spo_alert_full.c index be9092f..e48caff 100644 --- a/src/output-plugins/spo_alert_full.c +++ b/src/output-plugins/spo_alert_full.c @@ -329,8 +329,15 @@ static void AlertFullCleanup(int signal, void *arg, const char* msg) DEBUG_WRAP(DebugMessage(DEBUG_LOG, "%s\n", msg);); /* free memory from SpoAlertFullData */ - if ( data->log ) TextLog_Term(data->log); - free(data); + if ( data->log ) + { + TextLog_Term(data->log); + } + + if(data) + free(data); + + return; } static void AlertFullCleanExit(int signal, void *arg) diff --git a/src/output-plugins/spo_alert_prelude.c b/src/output-plugins/spo_alert_prelude.c index 2868aa2..941feb6 100644 --- a/src/output-plugins/spo_alert_prelude.c +++ b/src/output-plugins/spo_alert_prelude.c @@ -687,16 +687,16 @@ void snort_alert_prelude(Packet *p, void *event, u_int32_t event_type, void *dat static void snort_alert_prelude_clean_exit(int signal, void *data) { - /* - * A Snort sensor reporting to Prelude shall never go offline, - * which is why we use PRELUDE_CLIENT_EXIT_STATUS_FAILURE. - */ - prelude_client_destroy(data, PRELUDE_CLIENT_EXIT_STATUS_FAILURE); - - /* - * Free libprelude relevant data and synchronize asynchronous thread. - */ - prelude_deinit(); + /* + * A Snort sensor reporting to Prelude shall never go offline, + * which is why we use PRELUDE_CLIENT_EXIT_STATUS_FAILURE. + */ + prelude_client_destroy(data, PRELUDE_CLIENT_EXIT_STATUS_FAILURE); + + /* + * Free libprelude relevant data and synchronize asynchronous thread. + */ + prelude_deinit(); } diff --git a/src/output-plugins/spo_alert_syslog.c b/src/output-plugins/spo_alert_syslog.c index 96d79c1..a6d72de 100644 --- a/src/output-plugins/spo_alert_syslog.c +++ b/src/output-plugins/spo_alert_syslog.c @@ -659,6 +659,8 @@ void AlertSyslogCleanExit(int signal, void *arg) /* free memory from SyslogData */ if(data) free(data); + + closelog(); } void AlertSyslogRestart(int signal, void *arg) @@ -668,4 +670,7 @@ void AlertSyslogRestart(int signal, void *arg) /* free memory from SyslogData */ if(data) free(data); + + + closelog(); } diff --git a/src/output-plugins/spo_alert_unixsock.c b/src/output-plugins/spo_alert_unixsock.c index 9dfe4f1..efae79c 100644 --- a/src/output-plugins/spo_alert_unixsock.c +++ b/src/output-plugins/spo_alert_unixsock.c @@ -193,10 +193,14 @@ SpoAlertUnixSockData *ParseAlertUnixSockArgs(char *args) break; } } - if ( !filename ) filename = UNSOCK_FILE; + + if ( !filename ) + { + filename = strdup(UNSOCK_FILE); + } data->filename = ProcessFileOption(barnyard2_conf_for_parsing, filename); - + mSplitFree(&toks, num_toks); DEBUG_WRAP(DebugMessage( @@ -375,6 +379,17 @@ void AlertUnixSockCleanExit(int signal, void *arg) SpoAlertUnixSockData *data = (SpoAlertUnixSockData *)arg; DEBUG_WRAP(DebugMessage(DEBUG_LOG,"AlertUnixSockCleanExitFunc\n");); CloseAlertSock(data); + + if(data->filename) + { + free(data->filename); + } + + if(data) + { + free(data); + } + } void AlertUnixSockRestart(int signal, void *arg) @@ -382,6 +397,17 @@ void AlertUnixSockRestart(int signal, void *arg) SpoAlertUnixSockData *data = (SpoAlertUnixSockData *)arg; DEBUG_WRAP(DebugMessage(DEBUG_LOG,"AlertUnixSockRestartFunc\n");); CloseAlertSock(data); + + if(data->filename) + { + free(data->filename); + } + + if(data) + { + free(data); + } + } void CloseAlertSock(SpoAlertUnixSockData *data) diff --git a/src/output-plugins/spo_database.c b/src/output-plugins/spo_database.c index 0fd0533..e0787c3 100644 --- a/src/output-plugins/spo_database.c +++ b/src/output-plugins/spo_database.c @@ -60,7 +60,7 @@ static const char* FATAL_NO_SENSOR_2 = static const char* FATAL_BAD_SCHEMA_1 = "database: The underlying database has not been initialized correctly. This\n" - " version of Snort requires version %d of the DB schema. Your DB\n" + " version of barnyard2 requires version %d of the DB schema. Your DB\n" " doesn't appear to have any records in the 'schema' table.\n%s"; static const char* FATAL_BAD_SCHEMA_2 = @@ -74,8 +74,8 @@ static const char* FATAL_OLD_SCHEMA_1 = "database: The underlying database seems to be running an older version of\n" " the DB schema (current version=%d, required minimum version= %d).\n\n" " If you have an existing database with events logged by a previous\n" - " version of snort, this database must first be upgraded to the latest\n" - " schema (see the snort-users mailing list archive or DB plugin\n" + " version of barnyard2, this database must first be upgraded to the latest\n" + " schema (see the barnyard2-users mailing list archive or DB plugin\n" " documention for details).\n%s\n"; static const char* FATAL_OLD_SCHEMA_2 = @@ -87,10 +87,10 @@ static const char* FATAL_OLD_SCHEMA_2 = " and the URL to the most recent database plugin documentation.\n"; static const char* FATAL_NO_SUPPORT_1 = - "If this build of snort was obtained as a binary distribution (e.g., rpm,\n" + "If this build of barnyard2 was obtained as a binary distribution (e.g., rpm,\n" "or Windows), then check for alternate builds that contains the necessary\n" "'%s' support.\n\n" - "If this build of snort was compiled by you, then re-run the\n" + "If this build of barnyard2 was compiled by you, then re-run the\n" "the ./configure script using the '--with-%s' switch.\n" "For non-standard installations of a database, the '--with-%s=DIR'\n%s"; @@ -4029,6 +4029,7 @@ void Connect(DatabaseData * data) if(PQstatus(data->p_connection) == CONNECTION_BAD) { PQfinish(data->p_connection); + data->p_connection = NULL; FatalError("database Connection to database '%s' failed\n", data->dbname); } break; @@ -4062,16 +4063,26 @@ void Connect(DatabaseData * data) data->port == NULL ? 0 : atoi(data->port), NULL, 0) == NULL) { if(mysql_errno(data->m_sock)) - FatalError("database mysql_error: %s\n", mysql_error(data->m_sock)); - - FatalError("database Failed to logon to database '%s'\n", data->dbname); + { + LogMessage("database mysql_error: %s\n", mysql_error(data->m_sock)); + mysql_close(data->m_sock); + data->m_sock = NULL; + CleanExit(1); + } + + LogMessage("database Failed to logon to database '%s'\n", data->dbname); + mysql_close(data->m_sock); + data->m_sock = NULL; + CleanExit(1); } if(mysql_autocommit(data->m_sock,0)) { /* XXX */ + mysql_close(data->m_sock); + data->m_sock = NULL; LogMessage("WARNING database: unable to unset autocommit\n"); - return ; + return; } data->dbRH[data->dbtype_id].pThreadID = mysql_thread_id(data->m_sock); @@ -4320,8 +4331,9 @@ void Disconnect(DatabaseData * data) } if(data->p_connection) - { + { PQfinish(data->p_connection); + data->p_connection = NULL; } break; @@ -4340,7 +4352,7 @@ void Disconnect(DatabaseData * data) if(data->m_sock) { mysql_close(data->m_sock); - + data->m_sock = NULL; } @@ -4471,34 +4483,36 @@ void SpoDatabaseCleanExitFunction(int signal, void *arg) } } - + resetTransactionState(&data->dbRH[data->dbtype_id]); MasterCacheFlush(data,CACHE_FLUSH_ALL); SQL_Finalize(data); - UpdateLastCid(data, data->sid, ((data->cid)-1)); + if( !(data->dbRH[data->dbtype_id].dbConnectionStatus(&data->dbRH[data->dbtype_id]))) + { + UpdateLastCid(data, data->sid, ((data->cid)-1)); + } Disconnect(data); - } - - if(data->SQL_INSERT != NULL) - { - free(data->SQL_INSERT); + + if(data->SQL_INSERT != NULL) + { + free(data->SQL_INSERT); data->SQL_INSERT = NULL; - } - - if(data->SQL_SELECT != NULL) - { - free(data->SQL_SELECT); - data->SQL_SELECT = NULL; - } - - free(data->args); - free(data); + } + + if(data->SQL_SELECT != NULL) + { + free(data->SQL_SELECT); + data->SQL_SELECT = NULL; + } + + free(data->args); + free(data); data = NULL; - + } return; } @@ -4779,6 +4793,9 @@ u_int32_t MYSQL_ManualConnect(DatabaseData *dbdata) LogMessage("database: mysql_error: %s\n", mysql_error(dbdata->m_sock)); LogMessage("database: Failed to logon to database '%s'\n", dbdata->dbname); + + mysql_close(dbdata->m_sock); + dbdata->m_sock = NULL; return 1; } @@ -4787,6 +4804,8 @@ u_int32_t MYSQL_ManualConnect(DatabaseData *dbdata) { /* XXX */ LogMessage("database Can't set autocommit off \n"); + mysql_close(dbdata->m_sock); + dbdata->m_sock = NULL; return 1; } @@ -4794,6 +4813,8 @@ u_int32_t MYSQL_ManualConnect(DatabaseData *dbdata) if (mysql_options(dbdata->m_sock, MYSQL_OPT_RECONNECT, &dbdata->dbRH[dbdata->dbtype_id].mysql_reconnect) != 0) { LogMessage("database: Failed to set reconnect option: %s\n", mysql_error(dbdata->m_sock)); + mysql_close(dbdata->m_sock); + dbdata->m_sock = NULL; return 1; } @@ -4819,6 +4840,9 @@ u_int32_t dbConnectionStatusMYSQL(dbReliabilityHandle *pdbRH) dbdata = pdbRH->dbdata; + if(dbdata->m_sock == NULL) + return 1; + MYSQL_RetryConnection: /* mysql_ping() could reconnect and we wouldn't know */ @@ -5091,7 +5115,7 @@ u_int32_t dbConnectionStatusPOSTGRESQL(dbReliabilityHandle *pdbRH) DatabaseData *data = NULL; int PQpingRet = 0; - + if( (pdbRH == NULL) || (pdbRH->dbdata == NULL)) { @@ -5133,7 +5157,11 @@ u_int32_t dbConnectionStatusPOSTGRESQL(dbReliabilityHandle *pdbRH) setTransactionState(pdbRH); } - PQreset(data->p_connection); + if(data->p_connection) + { + PQfinish(data->p_connection); + data->p_connection = NULL; + } break; } #endif @@ -5163,7 +5191,11 @@ u_int32_t dbConnectionStatusPOSTGRESQL(dbReliabilityHandle *pdbRH) } /* Changed PQreset by call to PQfinish and PQdbLogin */ - PQfinish(data->p_connection); + if(data->p_connection) + { + PQfinish(data->p_connection); + data->p_connection = NULL; + } if (data->use_ssl == 1) { diff --git a/src/output-plugins/spo_log_tcpdump.c b/src/output-plugins/spo_log_tcpdump.c index ebb0cb9..bb3de61 100644 --- a/src/output-plugins/spo_log_tcpdump.c +++ b/src/output-plugins/spo_log_tcpdump.c @@ -566,7 +566,7 @@ static void SpoLogTcpdumpCleanup(int signal, void *arg, const char* msg) free (data->filename); } - bzero(data, sizeof(LogTcpdumpData)); + memset(data,'\0',sizeof(LogTcpdumpData)); free(data); } @@ -598,4 +598,4 @@ void DirectLogTcpdump(struct pcap_pkthdr *ph, uint8_t *pkt) log_tcpdump_ptr->size += dumpSize; } -#endif /* HAVE_LIBPCAP */ \ No newline at end of file +#endif /* HAVE_LIBPCAP */ diff --git a/src/output-plugins/spo_sguil.c b/src/output-plugins/spo_sguil.c index 118c328..6fa8f65 100644 --- a/src/output-plugins/spo_sguil.c +++ b/src/output-plugins/spo_sguil.c @@ -1209,20 +1209,29 @@ void SguilCleanExitFunc(int signal, void *arg) /* free allocated memory from SpoSguilData */ if (ssd_data) { - if (ssd_data->sensor_name) - free(ssd_data->sensor_name); - if (ssd_data->tag_path) - free(ssd_data->tag_path); - - if (ssd_data->passwd) - free(ssd_data->passwd); - - if (ssd_data->args) - free(ssd_data->args); - - free(ssd_data); + if(ssd_data->agent_sock > 0) + { + close(ssd_data->agent_sock); + ssd_data->agent_sock = -1; + } + + + if (ssd_data->sensor_name) + free(ssd_data->sensor_name); + + if (ssd_data->tag_path) + free(ssd_data->tag_path); + + if (ssd_data->passwd) + free(ssd_data->passwd); + + if (ssd_data->args) + free(ssd_data->args); + + free(ssd_data); } + } void SguilRestartFunc(int signal, void *arg) @@ -1234,19 +1243,26 @@ void SguilRestartFunc(int signal, void *arg) /* free allocated memory from SpoSguilData */ if (ssd_data) { - if (ssd_data->sensor_name) - free(ssd_data->sensor_name); - - if (ssd_data->tag_path) - free(ssd_data->tag_path); - - if (ssd_data->passwd) - free(ssd_data->passwd); - - if (ssd_data->args) - free(ssd_data->args); - free(ssd_data); + if(ssd_data->agent_sock > 0) + { + close(ssd_data->agent_sock); + ssd_data->agent_sock = -1; + } + + if (ssd_data->sensor_name) + free(ssd_data->sensor_name); + + if (ssd_data->tag_path) + free(ssd_data->tag_path); + + if (ssd_data->passwd) + free(ssd_data->passwd); + + if (ssd_data->args) + free(ssd_data->args); + + free(ssd_data); } } diff --git a/src/output-plugins/spo_syslog_full.c b/src/output-plugins/spo_syslog_full.c index 89ed84e..be004c4 100644 --- a/src/output-plugins/spo_syslog_full.c +++ b/src/output-plugins/spo_syslog_full.c @@ -224,6 +224,8 @@ void OpSyslog_Exit(int signal,void *pSyslogContext) } NetClose(iSyslogContext); + + free(iSyslogContext); return; } diff --git a/src/parser.c b/src/parser.c index 956e07c..68ae794 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1298,35 +1298,11 @@ static void ParseConfig(Barnyard2Config *bc, char *args) if (num_toks > 1) { - /* Dup the opts because we're putting into hash table */ + opts = SnortStrdup(toks[1]); DEBUG_WRAP(DebugMessage(DEBUG_CONFIGRULES,"Args: %s\n", opts);); } -/* - switch (sfghash_add(bc->config_table, toks[0], opts)) - { - case SFGHASH_NOMEM: - FatalError("%s(%d) No memory to add entry to config table.\n", - __FILE__, __LINE__); - break; - - case SFGHASH_INTABLE: - */ - /* Only reference and classifications are likely dup candidates - * right now and we're not too worried about keeping track of - * all of them */ -/* if (opts != NULL) - { - free(opts); - opts = toks[1]; - } - - break; - default: - break; - } -*/ for (i = 0; config_opts[i].name != NULL; i++) { if (strcasecmp(toks[0], config_opts[i].name) == 0) @@ -1359,6 +1335,12 @@ static void ParseConfig(Barnyard2Config *bc, char *args) } mSplitFree(&toks, num_toks); + + if(opts) + { + free(opts); + } + } /* diff --git a/src/parser.h b/src/parser.h index 6688162..d3aa13b 100644 --- a/src/parser.h +++ b/src/parser.h @@ -153,6 +153,7 @@ void ConfigMaxMplsLabelChain(Barnyard2Config *, char *); void ConfigMplsPayloadType(Barnyard2Config *, char *); #endif void ConfigSigSuppress(Barnyard2Config *, char *); +void DisplaySigSuppress(SigSuppress_list **); // use this so mSplit doesn't split IP lists (try c = ';') diff --git a/src/plugbase.c b/src/plugbase.c index 1d82e27..545be72 100644 --- a/src/plugbase.c +++ b/src/plugbase.c @@ -82,6 +82,7 @@ extern OutputConfigFuncNode *output_config_funcs; extern PluginSignalFuncNode *plugin_shutdown_funcs; extern PluginSignalFuncNode *plugin_clean_exit_funcs; extern PluginSignalFuncNode *plugin_restart_funcs; + extern InputFuncNode *InputList; extern OutputFuncNode *AlertList; extern OutputFuncNode *LogList; @@ -98,7 +99,6 @@ InputFuncNode *InputList; void RegisterInputPlugins() { LogMessage("Initializing Input Plugins!\n"); - Unified2Setup(); } @@ -201,6 +201,7 @@ void RegisterInputPlugin(char *keyword, InputConfigFunc func) node2->keyword = SnortStrdup(keyword); } + InputConfigFunc GetInputConfigFunc(char *keyword) { InputConfigFuncNode *head = input_config_funcs; @@ -324,7 +325,7 @@ static void AppendOutputFuncList(OutputFunc, void *, OutputFuncNode **); void RegisterOutputPlugins(void) { LogMessage("Initializing Output Plugins!\n"); - + AlertCEFSetup(); AlertSyslogSetup(); @@ -469,8 +470,61 @@ void FreeOutputConfigFuncs(void) free(head); head = tmp; } + + output_config_funcs = NULL; +} + + +void FreeInputPlugins(void) +{ + + InputConfigFuncNode *tmp = input_config_funcs; + InputConfigFuncNode *next = NULL; + + InputFuncNode *tmp2 = InputList; + InputFuncNode *next2 = NULL; + + while(tmp != NULL) + { + next = tmp->next; + + if(tmp->keyword != NULL) + { + free(tmp->keyword); + tmp->keyword = NULL; + } + + free(tmp); + tmp = next; + } + + + while(tmp2 != NULL) + { + next2 =tmp2->next; + + if( tmp2->keyword != NULL) + { + free(tmp2->keyword); + tmp2->keyword = NULL; + } + + if( tmp2->arg != NULL) + { + free(tmp2->arg); + tmp2->arg = NULL; + } + + free(tmp2); + tmp2 = next2; + } + + input_config_funcs = NULL; + InputList = NULL; + return; } + void FreeOutputList(OutputFuncNode *list) { while (list != NULL) @@ -484,6 +538,7 @@ void FreeOutputList(OutputFuncNode *list) free(tmp); } } + } /**************************************************************************** @@ -735,6 +790,7 @@ void AddFuncToSignalList(PluginSignalFunc func, void *arg, PluginSignalFuncNode node->arg = arg; } + void FreePluginSigFuncs(PluginSignalFuncNode *head) { while (head != NULL) diff --git a/src/plugbase.h b/src/plugbase.h index 01f337a..fbab76e 100644 --- a/src/plugbase.h +++ b/src/plugbase.h @@ -190,6 +190,6 @@ void AddFuncToPostConfigList(PluginSignalFunc, void *); void AddFuncToSignalList(PluginSignalFunc, void *, PluginSignalFuncNode **); void PostConfigInitPlugins(PluginSignalFuncNode *); void FreePluginSigFuncs(PluginSignalFuncNode *); - +void FreeInputPlugins(void); #endif /* __PLUGBASE_H__ */ diff --git a/src/spooler.c b/src/spooler.c index ed04b22..d1b1052 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -162,6 +162,8 @@ Spooler *spoolerOpen(const char *dirpath, const char *filename, uint32_t extensi /* create the spooler structure and allocate all memory */ spooler = (Spooler *)SnortAlloc(sizeof(Spooler)); + RegisterSpooler(spooler); + /* allocate some extra structures required (ie. Packet) */ spooler->fd = -1; @@ -180,6 +182,7 @@ Spooler *spoolerOpen(const char *dirpath, const char *filename, uint32_t extensi /* sanity check the filepath */ if (ret != SNORT_SNPRINTF_SUCCESS) { + UnRegisterSpooler(spooler); spoolerClose(spooler); FatalError("spooler: filepath too long!\n"); } @@ -193,6 +196,7 @@ Spooler *spoolerOpen(const char *dirpath, const char *filename, uint32_t extensi { LogMessage("ERROR: Unable to open log spool file '%s' (%s)\n", spooler->filepath, strerror(errno)); + UnRegisterSpooler(spooler); spoolerClose(spooler); spooler = NULL; return NULL; @@ -205,6 +209,7 @@ Spooler *spoolerOpen(const char *dirpath, const char *filename, uint32_t extensi if (spooler->ifn == NULL) { + UnRegisterSpooler(spooler); spoolerClose(spooler); spooler = NULL; FatalError("ERROR: No suitable input plugin found!\n"); @@ -234,6 +239,51 @@ int spoolerClose(Spooler *spooler) return 0; } +void RegisterSpooler(Spooler *spooler) +{ + Barnyard2Config *bc = BcGetConfig(); + + if(!bc) + return; + + + if(bc->spooler) + { + /* XXX */ + FatalError("[%s()], can't register spooler. \n", + __FUNCTION__); + } + else + { + bc->spooler = spooler; + } + + return; +} + +void UnRegisterSpooler(Spooler *spooler) +{ + Barnyard2Config *bc = BcGetConfig(); + + if(!bc) + return; + + if(bc->spooler != spooler) + { + /* XXX */ + FatalError("[%s()], can't un-register spooler. \n", + __FUNCTION__); + } + else + { + bc->spooler = NULL; + } + + return; +} + + + int spoolerReadRecordHeader(Spooler *spooler) { int ret; @@ -315,6 +365,9 @@ int ProcessBatch(const char *dirpath, const char *filename) while (exit_signal == 0 && pb_ret == 0) { + /* for SIGUSR1 / dropstats */ + SignalCheck(); + switch (spooler->state) { case SPOOLER_STATE_OPENED: @@ -404,6 +457,9 @@ int ProcessContinuous(const char *dirpath, const char *filebase, /* Start the main process loop */ while (exit_signal == 0) { + /* for SIGUSR1 / dropstats */ + SignalCheck(); + /* no spooler exists so let's create one */ if (spooler == NULL) { @@ -492,6 +548,7 @@ int ProcessContinuous(const char *dirpath, const char *filebase, #endif /* we've finished with the spooler so destroy and cleanup */ + UnRegisterSpooler(spooler); spoolerClose(spooler); spooler = NULL; @@ -568,6 +625,7 @@ int ProcessContinuous(const char *dirpath, const char *filebase, ArchiveFile(spooler->filepath, BcArchiveDir()); /* close (ie. destroy and cleanup) the spooler so we can rotate */ + UnRegisterSpooler(spooler); spoolerClose(spooler); spooler = NULL; @@ -608,8 +666,8 @@ int ProcessContinuous(const char *dirpath, const char *filebase, /* close waldo if appropriate */ if(barnyard2_conf) - spoolerCloseWaldo(&barnyard2_conf->waldo); - + spoolerCloseWaldo(&barnyard2_conf->waldo); + return pc_ret; } @@ -918,6 +976,36 @@ int spoolerEventCacheClean(Spooler *spooler) return 0; } +void spoolerEventCacheFlush(Spooler *spooler) +{ + EventRecordNode *next_ptr = NULL; + EventRecordNode *evt_ptr = NULL; + + if (spooler == NULL || spooler->event_cache == NULL ) + return; + + evt_ptr = spooler->event_cache; + + while(evt_ptr != NULL) + { + next_ptr = evt_ptr->next; + + if(evt_ptr->data) + { + free(evt_ptr->data); + evt_ptr->data = NULL; + } + + free(evt_ptr); + + evt_ptr = next_ptr; + } + + spooler->event_cache = NULL; + + return; +} + void spoolerFreeRecord(Record *record) { @@ -926,6 +1014,7 @@ void spoolerFreeRecord(Record *record) free(record->data); } + record->data = NULL; } @@ -996,13 +1085,17 @@ int spoolerOpenWaldo(Waldo *waldo, uint8_t mode) */ int spoolerCloseWaldo(Waldo *waldo) { - + if(waldo == NULL) + return WALDO_STRUCT_EMPTY; + /* check we have a valid file descriptor */ if (waldo->state & WALDO_STATE_OPEN) return WALDO_FILE_EOPEN; /* close the file */ - close(waldo->fd); + if(waldo->fd > 0) + close(waldo->fd); + waldo->fd = -1; /* reset open state and mode */ diff --git a/src/spooler.h b/src/spooler.h index feb9cdb..c629c00 100644 --- a/src/spooler.h +++ b/src/spooler.h @@ -98,7 +98,7 @@ typedef struct _Spooler void *header; // header of input file Record record; // data of current Record - + EventRecordNode *event_cache; // linked list of cached events uint32_t events_cached; @@ -130,6 +130,12 @@ int ProcessBatch(const char *, const char *); int ProcessWaldoFile(const char *); int spoolerReadWaldo(Waldo *); +void spoolerEventCacheFlush(Spooler *); +void RegisterSpooler(Spooler *); +void UnRegisterSpooler(Spooler *); + +int spoolerCloseWaldo(Waldo *); +int spoolerClose(Spooler *); #endif /* __SPOOLER_H__ */ diff --git a/src/util.c b/src/util.c index 704b5aa..2a2d7a4 100644 --- a/src/util.c +++ b/src/util.c @@ -593,7 +593,8 @@ NORETURN void FatalError(const char *format,...) #endif } - exit(1); + CleanExit(1); + } @@ -1020,6 +1021,13 @@ void CleanupProtoNames(void) protocol_names[i] = NULL; } } + + if(protocol_names) + { + free(protocol_names); + protocol_names = NULL; + } + } /**************************************************************************** @@ -1080,9 +1088,9 @@ void GoDaemon(void) { #ifndef WIN32 int exit_val = 0; - int ret = 0; + int ret = 0; pid_t fs; - + LogMessage("Initializing daemon mode\n"); if (BcDaemonRestart()) @@ -1181,7 +1189,6 @@ void GoDaemon(void) ret = dup(0); /* stderr, fd 0 => fd 2 */ SignalWaitingParent(); - #endif /* ! WIN32 */ } From 99c81885e3261624002eb364507cf9581a1588ed Mon Sep 17 00:00:00 2001 From: firnsy Date: Tue, 7 May 2013 13:45:01 +1000 Subject: [PATCH 017/198] fixed: libwebsocket update collapsed a number of arguments into general struct. --- src/output-plugins/spo_echidna.c | 35 +++++++++++++++++--------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/output-plugins/spo_echidna.c b/src/output-plugins/spo_echidna.c index 1914888..9bbe1c1 100644 --- a/src/output-plugins/spo_echidna.c +++ b/src/output-plugins/spo_echidna.c @@ -254,9 +254,6 @@ callback_lws_mirror(struct libwebsocket_context *this, struct libwebsocket *wsi, case LWS_CALLBACK_HTTP: //fprintf(stderr, " LWS_CALLBACK_HTTP\n"); break; - case LWS_CALLBACK_BROADCAST: - //fprintf(stderr, " LWS_CALLBACK_BROADCAST\n"); - break; case LWS_CALLBACK_FILTER_NETWORK_CONNECTION: //fprintf(stderr, " LWS_CALLBACK_FILTER_NETWORK_CONNECTION\n"); break; @@ -332,6 +329,8 @@ void EchidnaInit(char *args) // TODO: // AddFuncToIdleList(EchidnaIdle, spd_data); + + lws_set_log_level(0, NULL); } SpoEchidnaData *InitEchidnaData(char *args) @@ -704,22 +703,27 @@ int EchidnaNodeConnect(SpoEchidnaData *spd_data) { int ws_ret = 0; int tries = 10; + struct lws_context_creation_info info; DEBUG_WRAP(DebugMessage(DEBUG_PLUGIN, "echidna: creating context ... \n");); + info.port = CONTEXT_PORT_NO_LISTEN; + info.iface = NULL; + info.protocols = protocols; + info.gid = -1; + info.uid = -1; + info.options = 0; + +#ifndef LWS_NO_EXTENSIONS + info.extensions = libwebsocket_get_internal_extensions(); +#endif + + info.ssl_cert_filepath = NULL; + info.ssl_private_key_filepath = NULL; + info.ssl_ca_filepath = NULL; + /* create the websockt context */ - context = libwebsocket_create_context( - CONTEXT_PORT_NO_LISTEN, - NULL, - protocols, - libwebsocket_internal_extensions, - NULL, - NULL, - -1, - -1, - 0, - NULL - ); + context = libwebsocket_create_context(&info); if (context == NULL) { @@ -952,7 +956,6 @@ void EchidnaClose(void *arg) } /* cleanup the websocket contexts */ - libwebsocket_close_and_free_session(context, wsi_echidna, LWS_CLOSE_STATUS_GOINGAWAY); libwebsocket_context_destroy(context); /* clean up curl */ From bcbd6b0e48dab2409284213e59e3e3bda9dbe6ae Mon Sep 17 00:00:00 2001 From: firnsy Date: Tue, 7 May 2013 13:45:48 +1000 Subject: [PATCH 018/198] updated: build bump and removal of beta tag pending release. --- configure.in | 40 ++++++---------------------------------- src/barnyard2.h | 4 ++-- 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/configure.in b/configure.in index 03b001d..3960de1 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_PREREQ(2.50) AC_INIT(src/barnyard2.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(barnyard2,1.13-BETA) +AM_INIT_AUTOMAKE(barnyard2,1.13) AC_CONFIG_MACRO_DIR([m4]) LT_INIT @@ -1048,41 +1048,13 @@ AC_ARG_ENABLE(plugin-echidna, [ --enable-plugin-echidna Enable echidna plugin (experimental)], enable_plugin_echidna="$enableval", enable_plugin_echidna="no") if test "x$enable_plugin_echidna" = "xyes"; then + AC_CHECK_LIB([crypto], [SHA256_Init], [], [AC_MSG_ERROR([SHA256_Init was not found in libcrypto])]) + AC_CHECK_LIB([curl], [curl_easy_setopt], [], [AC_MSG_ERROR([curl_easy_setopt was not found in libcurl])]) + AC_CHECK_LIB([websockets], [libwebsocket_create_context], [], [AC_MSG_ERROR([libwebsocket_create_context was not found in libwebsockets])]) + AC_CHECK_LIB([json], [json_tokener_parse], [], [AC_MSG_ERROR([json_tokener_parse was not found in libjson])]) + CPPFLAGS="$CPPFLAGS -DENABLE_PLUGIN_ECHIDNA" LIBS="$LIBS -lwebsockets -ljson -lcurl -lcrypto" - - AC_CHECK_LIB(crypto, SHA256_Init,, LCRYPTO="no") - if test "x$LCRYPTO" = "xno"; then - echo - echo " ERROR! libcrypto not found!" - echo - exit 1 - fi - - AC_CHECK_LIB(curl, curl_easy_setopt,, LCURL="no") - if test "x$LCURL" = "xno"; then - echo - echo " ERROR! libcurl not found!" - echo - exit 1 - fi - - AC_CHECK_LIB(websockets, libwebsocket_create_context,, LWEBSOCKETS="no") - if test "x$LWEBSOCKETS" = "xno"; then - echo - echo " ERROR! libwebsockets not found." - echo - exit 1 - fi - - AC_CHECK_LIB(json, json_tokener_parse,, LJSON="no") - if test "x$LJSON" = "xno"; then - echo - echo " ERROR! libjson not found." - echo - exit 1 - fi - fi diff --git a/src/barnyard2.h b/src/barnyard2.h index 17cb431..0039d42 100644 --- a/src/barnyard2.h +++ b/src/barnyard2.h @@ -62,8 +62,8 @@ #define PROGRAM_NAME "Barnyard" #define VER_MAJOR "2" #define VER_MINOR "1" -#define VER_REVISION "13-BETA" -#define VER_BUILD "326" +#define VER_REVISION "13" +#define VER_BUILD "327" #define STD_BUF 1024 From 33f49f8516619605768a71c825a30bba6cab2823 Mon Sep 17 00:00:00 2001 From: firnsy Date: Thu, 9 May 2013 15:59:07 +1000 Subject: [PATCH 019/198] fixed: range logic was inadvertenly inverted. --- src/plugbase.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugbase.c b/src/plugbase.c index 545be72..68f6bb5 100644 --- a/src/plugbase.c +++ b/src/plugbase.c @@ -620,7 +620,7 @@ int pbCheckSignatureSuppression(void *event) SigSuppress_list *cNode = NULL; u_int32_t gid = 0; u_int32_t sid = 0; - + if( (uCommon == NULL) || (sHead == NULL)) { @@ -647,8 +647,8 @@ int pbCheckSignatureSuppression(void *event) break; case SS_RANGE: - if( (cNode->ss_min >= sid) && - (cNode->ss_max <= sid)) + if( (sid >= cNode->ss_min) && + (sid <= cNode->ss_max)) { SigSuppressCount(); return 1; From b0ccd2241b94984e0f17e74258ba198a0332496e Mon Sep 17 00:00:00 2001 From: firnsy Date: Thu, 9 May 2013 16:02:04 +1000 Subject: [PATCH 020/198] fixed: lingering reference identifid during HUP operations. --- src/barnyard2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/barnyard2.c b/src/barnyard2.c index 47b6ac4..c9c1a7e 100644 --- a/src/barnyard2.c +++ b/src/barnyard2.c @@ -1710,8 +1710,11 @@ static Barnyard2Config * MergeBarnyard2Confs(Barnyard2Config *cmd_line, Barnyard return cmd_line; if(cmd_line->ssHead) - config_file->ssHead = cmd_line->ssHead; - + { + config_file->ssHead = cmd_line->ssHead; + cmd_line->ssHead = NULL; + } + if( (cmd_line->sid_msg_file) && (config_file->sid_msg_file)) { From 317f4be06be25b8752938a33e1c52bc04da64ff0 Mon Sep 17 00:00:00 2001 From: firnsy Date: Thu, 9 May 2013 16:06:42 +1000 Subject: [PATCH 021/198] added: handle situations where map files are not v2. --- src/map.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/map.c b/src/map.c index 034da34..a49ce22 100644 --- a/src/map.c +++ b/src/map.c @@ -1150,13 +1150,25 @@ void ParseGenMapLine(char *data) } } - /* - Generators have pre-defined revision,classification and priority - */ - t_sn.rev = 1; - t_sn.classLiteral = strdup("NOCLASS"); /* default */ - t_sn.class_id = 0; - t_sn.priority = 3; + switch(BcSidMapVersion()) + { + case SIDMAPV1: + t_sn.rev = 1; + t_sn.priority = 0; + t_sn.classLiteral = strdup("NOCLASS"); /* default */ + t_sn.class_id = 0; + break; + + case SIDMAPV2: + /* + Generators have pre-defined revision,classification and priority + */ + t_sn.rev = 1; + t_sn.classLiteral = strdup("NOCLASS"); /* default */ + t_sn.class_id = 0; + t_sn.priority = 3; + break; + } /* Look if we have a brother inserted from sid map file */ if(SigLookup((SigNode *)*BcGetSigNodeHead(),t_sn.generator,t_sn.id,SOURCE_SID_MSG,&sn)) From d856c4145324ba707e6b158d13da398425f4281b Mon Sep 17 00:00:00 2001 From: firnsy Date: Tue, 14 May 2013 15:07:56 +1000 Subject: [PATCH 022/198] fixed: issue with signature insertion and v1/v2 sid-msg.map handling. --- src/output-plugins/spo_database.c | 99 ++++++++++++++++--------------- 1 file changed, 52 insertions(+), 47 deletions(-) diff --git a/src/output-plugins/spo_database.c b/src/output-plugins/spo_database.c index e0787c3..5784a93 100644 --- a/src/output-plugins/spo_database.c +++ b/src/output-plugins/spo_database.c @@ -1288,7 +1288,6 @@ void ParseDatabaseArgs(DatabaseData *data) */ u_int32_t dbSignatureInformationUpdate(DatabaseData *data,cacheSignatureObj *iUpdateSig) { - u_int32_t db_sig_id = 0; if( (data == NULL) || @@ -1489,7 +1488,6 @@ int dbProcessSignatureInformation(DatabaseData *data,void *event, u_int32_t even if( (sigMatchCount = cacheEventSignatureLookup(data->mc.cacheSignatureHead, data->mc.plgSigCompare, gid,sid)) > 0 ) - { for(x = 0 ; x < sigMatchCount ; x++) { if( (data->mc.plgSigCompare[x].cacheSigObj->obj.rev == revision) && @@ -1503,8 +1501,14 @@ int dbProcessSignatureInformation(DatabaseData *data,void *event, u_int32_t even } /* If we have an "uninitialized signature save it */ - if( data->mc.plgSigCompare[x].cacheSigObj->obj.rev == 0 || - data->mc.plgSigCompare[x].cacheSigObj->obj.rev < revision) + if( (data->mc.plgSigCompare[x].cacheSigObj->obj.rev == 0) || + (data->mc.plgSigCompare[x].cacheSigObj->obj.rev < revision) || + + /* So we have a signature that was inserted, probably a preprocessor signature, + but it has probably never been logged before lets set it as a temporary unassigned signature */ + ((data->mc.plgSigCompare[x].cacheSigObj->obj.rev == revision) && + (data->mc.plgSigCompare[x].cacheSigObj->obj.class_id == 0 || + (data->mc.plgSigCompare[x].cacheSigObj->obj.priority_id == 0)))) { memcpy(&unInitSig,data->mc.plgSigCompare[x].cacheSigObj,sizeof(cacheSignatureObj)); @@ -1520,50 +1524,51 @@ int dbProcessSignatureInformation(DatabaseData *data,void *event, u_int32_t even } } } - } + + if(BcSidMapVersion() == SIDMAPV1) + { + if(unInitSig.obj.db_id != 0) + { +#if DEBUG + DEBUG_WRAP(DebugMessage(DB_DEBUG, + "[%s()], [%u] signatures where found in cache for [gid: %u] [sid: %u] but non matched event criteria.\n" + "Updating database [db_sig_id: %u] FROM [rev: %u] classification [ %u ] priority [%u] " + " TO [rev: %u] classification [ %u ] priority [%u]\n", + __FUNCTION__, + sigMatchCount, + gid, + sid, + unInitSig.obj.db_id, + unInitSig.obj.rev,unInitSig.obj.class_id,unInitSig.obj.priority_id, + revision,db_classification_id,priority)); +#endif + + unInitSig.obj.rev = revision; + unInitSig.obj.class_id = db_classification_id; + unInitSig.obj.priority_id = priority; + + if( (dbSignatureInformationUpdate(data,&unInitSig))) + { + + LogMessage("[%s()] Line[%u], call to dbSignatureInformationUpdate failed for : \n" + "[gid :%u] [sid: %u] [upd_rev: %u] [upd class: %u] [upd pri %u]\n", + __FUNCTION__, + __LINE__, + gid, \ + sid, + revision, + db_classification_id, + priority); + return 1; + } + + assert( unInitSig.obj.db_id != 0); -/* - This shouldn't be needed since unitialized signature are not inserted anymore, thus preventing the need for update - if(unInitSig.obj.db_id != 0) - { - #if DEBUG - DEBUG_WRAP(DebugMessage(DB_DEBUG,"[%s()], [%u] signatures where found in cache for [gid: %u] [sid: %u] but non matched\n" - "updating database [db_sig_id: %u] with [rev: 0] to [rev: %u] \n", - __FUNCTION__, - sigMatchCount, - gid, - sid, - unInitSig.obj.db_id, - revision)); - #endif - - unInitSig.obj.rev = revision; - unInitSig.obj.class_id = db_classification_id; - unInitSig.obj.priority_id = priority; - - - if( (dbSignatureInformationUpdate(data,&unInitSig))) - { - - LogMessage("[%s()] Line[%u], call to dbSignatureInformationUpdate failed for : \n" - "[gid :%u] [sid: %u] [upd_rev: %u] [upd class: %u] [upd pri %u]\n", - __FUNCTION__, - __LINE__, - gid, \ - sid, - revision, - db_classification_id, - priority); - return 1; - } - - - assert( unInitSig.obj.db_id != 0); - - *psig_id = unInitSig.obj.db_id; - return 0; - } -*/ + *psig_id = unInitSig.obj.db_id; + return 0; + } + } + /* To avoid possible collision with an older barnyard process or avoid signature insertion race condition we will look in the From 5fefbe04f476b770d98a7ae58b271c257f541c57 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 May 2013 10:59:47 +0000 Subject: [PATCH 023/198] Parsed hosts and networks file in order to produce in spo_alert_json --- src/output-plugins/spo_alert_json.c | 67 ++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 06fb998..ad5cbe2 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -124,6 +124,13 @@ typedef struct _AlertJSONConfig struct _AlertJSONConfig *next; } AlertJSONConfig; +typedef struct _IP_str_assoc{ + char * str; + uint32_t ipv4; + uint32_t netmask; + struct _IP_str_assoc * next; +} IP_str_assoc; + typedef struct _AlertJSONData { TextLog* log; @@ -132,6 +139,7 @@ typedef struct _AlertJSONData char ** args; int numargs; AlertJSONConfig *config; + IP_str_assoc * hosts, *nets; } AlertJSONData; @@ -222,6 +230,60 @@ static void AlertJSONInit(char *args) AddFuncToRestartList(AlertRestart, data); } + +/* + * Function FillHostsList + * + * Purpose: Fill a host/net -> ip assotiation list from a hosts or network file + * (the format is the same as /etc/hosts and /etc/network) + * + * Arguments: filename => route to host/networks file + * list => list to fill + * mode => 0 to host mode, 1 to network mode. + * In hots mode, we expect 8.8.8.8 hostname + * In network mode, we expect 8.8.8.8/24 netname. + */ +static void FillHostsList(char * filename,IP_str_assoc ** list, const uint8_t mode){ + uint32_t ip_t[4]; + uint32_t netmask = 32; + char line_buffer[1024]; + FILE * file; + + if((file = fopen(filename, "r")) == NULL) + { + FatalError("fopen() alert file %s: %s\n",filename, strerror(errno)); + } + + IP_str_assoc ** pnode_aux = list; + int aux_ret; + while(NULL != fgets(line_buffer,1024,file)){ + if(line_buffer[0]!='#'){ + *pnode_aux = SnortAlloc(sizeof(IP_str_assoc)); + aux_ret = mode==0? + sscanf(line_buffer,"%d.%d.%d.%d",&ip_t[0],&ip_t[1],&ip_t[2],&ip_t[3]) + : sscanf(line_buffer,"%d.%d.%d.%d/%d",&ip_t[0],&ip_t[1],&ip_t[2],&ip_t[3], + &netmask); + char * name_string = strchr(line_buffer,' '); + while(isblank(*++name_string)); + if((mode==0?4:5) ==aux_ret && name_string && ip_t[0]<0x100 + && ip_t[1]<0x100 &&ip_t[2]<0x100 &&ip_t[3]<0x100) + { + name_string[strlen(name_string)-1] = '\0'; // delete '\n' + (*pnode_aux)->str = SnortStrdup(name_string); + (*pnode_aux)->ipv4 = (ip_t[0]<<24) + (ip_t[1]<<16) + (ip_t[2]<<8) + ip_t[3]; + if(mode==1) + (*pnode_aux)->netmask = 0xFFFFFFFF<next; + }else{ + free(*pnode_aux); + *pnode_aux=NULL; + } + } + } + + fclose(file); +} + /* * Function: ParseJSONArgs(char *) * @@ -312,6 +374,9 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->args = toks; data->numargs = num_toks; + FillHostsList("/opt/rb/etc/hosts",&data->hosts,0); + FillHostsList("/opt/rb/etc/networks",&data->nets,0); + DEBUG_WRAP(DebugMessage( DEBUG_INIT, "alert_json: '%s' '%s' %ld\n", filename, data->jsonargs, limit );); @@ -323,8 +388,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) kafka_str++; // skip the '+' } - - if(kafka_str){ const char * at_char_pos = strchr(kafka_str,BROKER_TOPIC_SEPARATOR); From 1126d598453364a063c1b9d126035ab4d3fa683d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 17 May 2013 08:52:35 +0000 Subject: [PATCH 024/198] Added src_name, src_str, dst_name and dst_str to json fields, based on /opt/rb/etc/{hosts,networks} files modified: output-plugins/spo_alert_json.c --- src/output-plugins/spo_alert_json.c | 92 ++++++++++++++++++++++++++--- 1 file changed, 85 insertions(+), 7 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index ad5cbe2..bec66c7 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -101,7 +101,11 @@ #define JSON_SRCPORT_NAME "srcport" #define JSON_DSTPORT_NAME "dstport" #define JSON_SRC_NAME "src" +#define JSON_SRC_STR_NAME "srcstr" +#define JSON_SRC_NAME_NAME "srcname" #define JSON_DST_NAME "dst" +#define JSON_DST_NAME_NAME "dstname" +#define JSON_DST_STR_NAME "dststr" #define JSON_ICMPTYPE_NAME "icmptype" #define JSON_ICMPCODE_NAME "icmpcode" #define JSON_ICMPID_NAME "icmpid" @@ -175,7 +179,7 @@ static void AlertJSON(Packet *, void *, uint32_t, void *); static void AlertJSONCleanExit(int, void *); static void AlertRestart(int, void *); static void RealAlertJSON( - Packet*, void*, uint32_t, char **args, int numargs, TextLog*,KafkaLog * + Packet*, void*, uint32_t, char **args, int numargs, AlertJSONData * data ); /* @@ -263,7 +267,8 @@ static void FillHostsList(char * filename,IP_str_assoc ** list, const uint8_t mo sscanf(line_buffer,"%d.%d.%d.%d",&ip_t[0],&ip_t[1],&ip_t[2],&ip_t[3]) : sscanf(line_buffer,"%d.%d.%d.%d/%d",&ip_t[0],&ip_t[1],&ip_t[2],&ip_t[3], &netmask); - char * name_string = strchr(line_buffer,' '); + char * name_string = line_buffer; + while(!isblank(*++name_string)); // skipping ip while(isblank(*++name_string)); if((mode==0?4:5) ==aux_ret && name_string && ip_t[0]<0x100 && ip_t[1]<0x100 &&ip_t[2]<0x100 &&ip_t[3]<0x100) @@ -284,6 +289,15 @@ static void FillHostsList(char * filename,IP_str_assoc ** list, const uint8_t mo fclose(file); } +static char * SearchStrIP(const uint32_t ip,const IP_str_assoc *iplist){ + IP_str_assoc * node; + for(node = (IP_str_assoc *)iplist;node;node=node->next){ + if(node->ipv4==ip) + return node->str; + } + return NULL; +} + /* * Function: ParseJSONArgs(char *) * @@ -447,7 +461,7 @@ static void AlertRestart(int signal, void *arg) static void AlertJSON(Packet *p, void *event, uint32_t event_type, void *arg) { AlertJSONData *data = (AlertJSONData *)arg; - RealAlertJSON(p, event, event_type, data->args, data->numargs, data->log,data->kafka); + RealAlertJSON(p, event, event_type, data->args, data->numargs, data); } static bool inline PrintJSONFieldName(TextLog * log,KafkaLog * kafka,const char *fieldName){ @@ -481,6 +495,39 @@ static bool inline LogJSON_a(TextLog *log,KafkaLog *kafka,const char *fieldName, return aok; } +/* + * A faster replacement for inet_ntoa(). + * Extracted from tcpdump + */ +char* _intoa(unsigned int addr, char* buf, u_short bufLen) { + char *cp, *retStr; + u_int byte; + int n; + + cp = &buf[bufLen]; + *--cp = '\0'; + + n = 4; + do { + byte = addr & 0xff; + *--cp = byte % 10 + '0'; + byte /= 10; + if (byte > 0) { + *--cp = byte % 10 + '0'; + byte /= 10; + if (byte > 0) + *--cp = byte + '0'; + } + *--cp = '.'; + addr >>= 8; + } while (--n > 0); + + /* Convert the string to lowercase */ + retStr = (char*)(cp+1); + + return(retStr); +} + /* * Function: RealAlertJSON(Packet *, char *, FILE *, char *, numargs const int) @@ -496,13 +543,16 @@ static bool inline LogJSON_a(TextLog *log,KafkaLog *kafka,const char *fieldName, * */ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, - char **args, int numargs, TextLog* log,KafkaLog * kafka) + char **args, int numargs, AlertJSONData * jsonData) { int num; - SigNode *sn; + SigNode *sn; char *type; char tcpFlags[9]; + TextLog* log = jsonData->log; + KafkaLog * kafka = jsonData->kafka; + if(p == NULL) return; @@ -689,25 +739,53 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, else if(!strncasecmp("src", type, 3)) { if(IPH_IS_VALID(p)){ + static char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; + const size_t bufLen = sizeof buf; + uint32_t ipv4 = ntohl(GET_SRC_ADDR(p).s_addr); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); /* String version PrintJSONFieldName(log,kafka,JSON_SRC_NAME); LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); */ - LogJSON_i32(log,kafka,JSON_SRC_NAME,ntohl(GET_SRC_ADDR(p).s_addr)); + LogJSON_i32(log,kafka,JSON_SRC_NAME,ipv4); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + char * ip_str = _intoa(ipv4, buf, bufLen); + LogJSON_a(log,kafka,JSON_SRC_STR_NAME,ip_str); + const char * ip_name = SearchStrIP(ipv4,jsonData->hosts); + if(NULL==ip_name) + ip_name = ip_str; + + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(log,kafka,JSON_SRC_NAME_NAME,ip_name); + } } else if(!strncasecmp("dst", type, 3)) { if(IPH_IS_VALID(p)){ + static char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; + const size_t bufLen = sizeof buf; + uint32_t ipv4 = ntohl(GET_DST_ADDR(p).s_addr); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); /* String version PrintJSONFieldName(log,kafka,JSON_DST_NAME); LogOrKafka_Puts(log,kafka, inet_ntoa(GET_DST_ADDR(p))); */ - LogJSON_i32(log,kafka,JSON_DST_NAME,ntohl(GET_DST_ADDR(p).s_addr)); + LogJSON_i32(log,kafka,JSON_DST_NAME,ipv4); + + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + char * ip_str = _intoa(ipv4, buf, bufLen); + LogJSON_a(log,kafka,JSON_DST_STR_NAME,ip_str); + const char * ip_name = SearchStrIP(ipv4,jsonData->hosts); + if(NULL==ip_name) + ip_name = ip_str; + + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(log,kafka,JSON_DST_NAME_NAME,ip_name); } } else if(!strncasecmp("icmptype",type,8)) From f048121e6ee362c328d81c17adf5f11309021767 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 17 May 2013 09:55:17 +0000 Subject: [PATCH 025/198] Added network identifications in source and destination ip modified: output-plugins/spo_alert_json.c --- src/output-plugins/spo_alert_json.c | 98 +++++++++++++++++++++++------ 1 file changed, 78 insertions(+), 20 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index bec66c7..096768c 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -101,11 +101,15 @@ #define JSON_SRCPORT_NAME "srcport" #define JSON_DSTPORT_NAME "dstport" #define JSON_SRC_NAME "src" -#define JSON_SRC_STR_NAME "srcstr" -#define JSON_SRC_NAME_NAME "srcname" +#define JSON_SRC_STR_NAME "src_str" +#define JSON_SRC_NAME_NAME "src_name" +#define JSON_SRC_NET_NAME "src_net" +#define JSON_SRC_NET_NAME_NAME "src_net_name" #define JSON_DST_NAME "dst" -#define JSON_DST_NAME_NAME "dstname" -#define JSON_DST_STR_NAME "dststr" +#define JSON_DST_NAME_NAME "dst_name" +#define JSON_DST_STR_NAME "dst_str" +#define JSON_DST_NET_NAME "dst_net" +#define JSON_DST_NET_NAME_NAME "dst_net_name" #define JSON_ICMPTYPE_NAME "icmptype" #define JSON_ICMPCODE_NAME "icmpcode" #define JSON_ICMPID_NAME "icmpid" @@ -130,6 +134,7 @@ typedef struct _AlertJSONConfig typedef struct _IP_str_assoc{ char * str; + char * ipv4_str; uint32_t ipv4; uint32_t netmask; struct _IP_str_assoc * next; @@ -269,7 +274,9 @@ static void FillHostsList(char * filename,IP_str_assoc ** list, const uint8_t mo &netmask); char * name_string = line_buffer; while(!isblank(*++name_string)); // skipping ip - while(isblank(*++name_string)); + *name_string = '\0'; + (*pnode_aux)->ipv4_str = SnortStrdup(line_buffer); + while(isblank(*++name_string)); // skipping blank spaces if((mode==0?4:5) ==aux_ret && name_string && ip_t[0]<0x100 && ip_t[1]<0x100 &&ip_t[2]<0x100 &&ip_t[3]<0x100) { @@ -289,11 +296,22 @@ static void FillHostsList(char * filename,IP_str_assoc ** list, const uint8_t mo fclose(file); } -static char * SearchStrIP(const uint32_t ip,const IP_str_assoc *iplist){ +IP_str_assoc * SearchStrIP(const uint32_t ip,const IP_str_assoc *iplist){ IP_str_assoc * node; for(node = (IP_str_assoc *)iplist;node;node=node->next){ if(node->ipv4==ip) - return node->str; + return node; + } + return NULL; +} + +IP_str_assoc * SearchStrNet(const uint32_t ip,const IP_str_assoc *netlist){ + IP_str_assoc * node; + for(node = (IP_str_assoc *)netlist;node;node=node->next){ + uint32_t ip_masked = ip&node->netmask; + if(node->ipv4 == ip_masked){ + return node; + } } return NULL; } @@ -389,7 +407,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->numargs = num_toks; FillHostsList("/opt/rb/etc/hosts",&data->hosts,0); - FillHostsList("/opt/rb/etc/networks",&data->nets,0); + FillHostsList("/opt/rb/etc/networks",&data->nets,1); DEBUG_WRAP(DebugMessage( DEBUG_INIT, "alert_json: '%s' '%s' %ld\n", filename, data->jsonargs, limit @@ -430,6 +448,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) static void AlertJSONCleanup(int signal, void *arg, const char* msg) { + IP_str_assoc * ip_node=NULL; AlertJSONData *data = (AlertJSONData *)arg; /* close alert file */ DEBUG_WRAP(DebugMessage(DEBUG_LOG,"%s\n", msg);); @@ -442,6 +461,22 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) if(data->kafka) KafkaLog_Term(data->kafka); free(data->jsonargs); + ip_node = data->hosts; + while(ip_node){ + IP_str_assoc * aux = ip_node->next; + free(ip_node->ipv4_str); + free(ip_node->str); + free(ip_node); + ip_node = aux; + } + ip_node = data->nets; + while(ip_node){ + IP_str_assoc * aux = ip_node->next; + free(ip_node->ipv4_str); + free(ip_node->str); + free(ip_node); + ip_node = aux; + } /* free memory from SpoJSONData */ free(data); } @@ -736,7 +771,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, } } } - else if(!strncasecmp("src", type, 3)) + else if(!strncasecmp("src", type, 3)) // TODO merge with "dst" field { if(IPH_IS_VALID(p)){ static char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; @@ -750,16 +785,28 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); */ LogJSON_i32(log,kafka,JSON_SRC_NAME,ipv4); + + char * ip_str=NULL,*ip_name=NULL; + IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); + if(ip_str_node){ + ip_str = ip_str_node->ipv4_str; + ip_name = ip_str_node->str; + }else{ + ip_name = ip_str = _intoa(ipv4, buf, bufLen); + } LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - char * ip_str = _intoa(ipv4, buf, bufLen); LogJSON_a(log,kafka,JSON_SRC_STR_NAME,ip_str); - const char * ip_name = SearchStrIP(ipv4,jsonData->hosts); - if(NULL==ip_name) - ip_name = ip_str; LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(log,kafka,JSON_SRC_NAME_NAME,ip_name); - + + // networks + IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(log,kafka,JSON_SRC_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(log,kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); + } } else if(!strncasecmp("dst", type, 3)) @@ -772,20 +819,31 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); /* String version - PrintJSONFieldName(log,kafka,JSON_DST_NAME); - LogOrKafka_Puts(log,kafka, inet_ntoa(GET_DST_ADDR(p))); + PrintJSONFieldName(log,kafka,JSON_SRC_NAME); + LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); */ LogJSON_i32(log,kafka,JSON_DST_NAME,ipv4); + char * ip_str=NULL,*ip_name=NULL; + IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); + if(ip_str_node){ + ip_str = ip_str_node->ipv4_str; + ip_name = ip_str_node->str; + }else{ + ip_name = ip_str = _intoa(ipv4, buf, bufLen); + } LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - char * ip_str = _intoa(ipv4, buf, bufLen); LogJSON_a(log,kafka,JSON_DST_STR_NAME,ip_str); - const char * ip_name = SearchStrIP(ipv4,jsonData->hosts); - if(NULL==ip_name) - ip_name = ip_str; LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(log,kafka,JSON_DST_NAME_NAME,ip_name); + + // networks + IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(log,kafka,JSON_DST_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(log,kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); } } else if(!strncasecmp("icmptype",type,8)) From 0896ef8dffa98b53883a483170023ab7a93fc4bf Mon Sep 17 00:00:00 2001 From: root Date: Sun, 19 May 2013 17:31:05 +0000 Subject: [PATCH 026/198] Added geoIP support using maxmind GeoIP modified: Makefile.am modified: output-plugins/spo_alert_json.c --- src/Makefile.am | 1 + src/output-plugins/spo_alert_json.c | 40 +++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7da6af2..4a96633 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,6 +33,7 @@ input-plugins/libspi.a \ sfutil/libsfutil.a \ sfutil/kafka/librdkafka.a \ -lpthread\ +-lGeoIP\ -lz -lrt diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 096768c..89ca924 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -70,6 +70,11 @@ #include "log_text.h" #include "ipv6_port.h" +#define GEO_IP +#ifdef GEO_IP +#include "GeoIP.h" +#endif // GEO_IP + #define DEFAULT_JSON "timestamp,sig_generator,sig_id,sig_rev,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" @@ -125,6 +130,11 @@ #define JSON_TCPWINDOW_NAME "tcpwindow" #define JSON_TCPFLAGS_NAME "tcpflags" +#ifdef GEO_IP +#define JSON_SRC_COUNTRY_NAME "src_country" +#define JSON_DST_COUNTRY_NAME "dst_country" +#endif // GEO_IP + typedef struct _AlertJSONConfig { @@ -149,6 +159,9 @@ typedef struct _AlertJSONData int numargs; AlertJSONConfig *config; IP_str_assoc * hosts, *nets; +#ifdef GEO_IP + GeoIP *gi; +#endif } AlertJSONData; @@ -406,8 +419,17 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->args = toks; data->numargs = num_toks; - FillHostsList("/opt/rb/etc/hosts",&data->hosts,0); - FillHostsList("/opt/rb/etc/networks",&data->nets,1); + FillHostsList("/etc/hosts",&data->hosts,0); + FillHostsList("/etc/barnyard_networks",&data->nets,1); + +#ifdef GEO_IP + const char * geoIP_path = "/usr/local/share/GeoIP/GeoIP.dat"; + data->gi = GeoIP_open(geoIP_path, GEOIP_MEMORY_CACHE); + + if (data->gi == NULL) + FatalError("Error opening database %s\n",geoIP_path); + +#endif // GEO_IP DEBUG_WRAP(DebugMessage( DEBUG_INIT, "alert_json: '%s' '%s' %ld\n", filename, data->jsonargs, limit @@ -477,6 +499,10 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) free(ip_node); ip_node = aux; } + + #ifdef GEO_IP + GeoIP_delete(data->gi); + #endif // GWO_IP /* free memory from SpoJSONData */ free(data); } @@ -807,6 +833,11 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(log,kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); + #ifdef GEO_IP + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(log,kafka,JSON_SRC_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); + #endif + } } else if(!strncasecmp("dst", type, 3)) @@ -844,6 +875,11 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogJSON_a(log,kafka,JSON_DST_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(log,kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); + + #ifdef GEO_IP + LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(log,kafka,JSON_DST_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); + #endif } } else if(!strncasecmp("icmptype",type,8)) From dd159eddd15fb878b1c45d6c9462d4908c98f7c0 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 20 May 2013 13:43:21 +0000 Subject: [PATCH 027/198] Fixed a possible memory leak. modified: src/sfutil/sf_kafka.c --- src/sfutil/sf_kafka.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sfutil/sf_kafka.c b/src/sfutil/sf_kafka.c index 99866cb..098ebd7 100644 --- a/src/sfutil/sf_kafka.c +++ b/src/sfutil/sf_kafka.c @@ -154,7 +154,10 @@ bool KafkaLog_Flush(KafkaLog* this) if(this->handler==NULL && BcDaemonMode()){ this->handler = KafkaLog_Open(this->broker); } - rd_kafka_produce(this->handler, this->topic, 0, RD_KAFKA_OP_F_FREE, this->buf, this->pos); + if(this->handler->rk_state == RD_KAFKA_STATE_DOWN) + free(this->buf); + else + rd_kafka_produce(this->handler, this->topic, 0, RD_KAFKA_OP_F_FREE, this->buf, this->pos); this->buf = malloc(sizeof(char)*this->maxBuf); KafkaLog_Reset(this); From 6072ae57d17bf53926403820b370cb745b2bcb22 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 20 May 2013 13:44:06 +0000 Subject: [PATCH 028/198] Fixed some possible memory leaks and enabled --enable-geo-ip in configure script modified: configure.in modified: src/output-plugins/spo_alert_json.c --- configure.in | 11 +++++++++++ src/output-plugins/spo_alert_json.c | 23 ++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/configure.in b/configure.in index 3960de1..ca70c7e 100644 --- a/configure.in +++ b/configure.in @@ -124,6 +124,17 @@ if test "x$enable_64bit_gcc" = "xyes"; then CFLAGS="$CFLAGS -m64" fi +AC_MSG_CHECKING(for Maxmind GeiIP libraries) +AC_ARG_ENABLE(geo-ip, +[ --enable-geo-ip Enable geo-ip localization.], + enable_geo_ip="$enableval", enable_geop_ip="no") +if test "x$enable_geo_ip" = "xyes"; then + AC_MSG_RESULT(yes) + CFLAGS="$CFLAGS -DJSON_GEO_IP" +else + AC_MSG_RESULT(no) +fi + # AC_PROG_YACC defaults to "yacc" when not found # this check defaults to "none" AC_CHECK_PROGS(YACC,bison yacc,none) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 89ca924..568d4ec 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -70,10 +70,9 @@ #include "log_text.h" #include "ipv6_port.h" -#define GEO_IP -#ifdef GEO_IP +#ifdef JSON_GEO_IP #include "GeoIP.h" -#endif // GEO_IP +#endif // JSON_GEO_IP #define DEFAULT_JSON "timestamp,sig_generator,sig_id,sig_rev,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" @@ -130,10 +129,10 @@ #define JSON_TCPWINDOW_NAME "tcpwindow" #define JSON_TCPFLAGS_NAME "tcpflags" -#ifdef GEO_IP +#ifdef JSON_GEO_IP #define JSON_SRC_COUNTRY_NAME "src_country" #define JSON_DST_COUNTRY_NAME "dst_country" -#endif // GEO_IP +#endif // JSON_GEO_IP typedef struct _AlertJSONConfig @@ -159,7 +158,7 @@ typedef struct _AlertJSONData int numargs; AlertJSONConfig *config; IP_str_assoc * hosts, *nets; -#ifdef GEO_IP +#ifdef JSON_GEO_IP GeoIP *gi; #endif } AlertJSONData; @@ -300,6 +299,7 @@ static void FillHostsList(char * filename,IP_str_assoc ** list, const uint8_t mo (*pnode_aux)->netmask = 0xFFFFFFFF<next; }else{ + free((*pnode_aux)->ipv4_str); free(*pnode_aux); *pnode_aux=NULL; } @@ -422,14 +422,14 @@ static AlertJSONData *AlertJSONParseArgs(char *args) FillHostsList("/etc/hosts",&data->hosts,0); FillHostsList("/etc/barnyard_networks",&data->nets,1); -#ifdef GEO_IP +#ifdef JSON_GEO_IP const char * geoIP_path = "/usr/local/share/GeoIP/GeoIP.dat"; data->gi = GeoIP_open(geoIP_path, GEOIP_MEMORY_CACHE); if (data->gi == NULL) FatalError("Error opening database %s\n",geoIP_path); -#endif // GEO_IP +#endif // JSON_GEO_IP DEBUG_WRAP(DebugMessage( DEBUG_INIT, "alert_json: '%s' '%s' %ld\n", filename, data->jsonargs, limit @@ -457,6 +457,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) * send kafka data*/ data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char_pos+1,KAFKA_PARTITION,BcDaemonMode()?0:1); + free(kafka_server); } @@ -500,7 +501,7 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) ip_node = aux; } - #ifdef GEO_IP + #ifdef JSON_GEO_IP GeoIP_delete(data->gi); #endif // GWO_IP /* free memory from SpoJSONData */ @@ -833,7 +834,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(log,kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); - #ifdef GEO_IP + #ifdef JSON_GEO_IP LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(log,kafka,JSON_SRC_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); #endif @@ -876,7 +877,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(log,kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); - #ifdef GEO_IP + #ifdef JSON_GEO_IP LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(log,kafka,JSON_DST_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); #endif From 974bef55fa54520afd1f5fe2b961de92e5e2c130 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 20 May 2013 13:54:23 +0000 Subject: [PATCH 029/198] Updated librdkafka --- src/sfutil/kafka/librdkafka.a | Bin 139260 -> 137308 bytes src/sfutil/kafka/rdaddr.h | 25 +++++++++---------------- src/sfutil/kafka/rdkafka.h | 29 ++++++++++++++++++++++++++++- 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/src/sfutil/kafka/librdkafka.a b/src/sfutil/kafka/librdkafka.a index 4825afe3f70982284280acff115d9fe95216fbf0..c78e8468ded238461dcc26d065b969d5f7a9c0ef 100644 GIT binary patch literal 137308 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 literal 139260 zcmeFadwf*Y)jxdBoFNWL$V4EBw=!zbP$eXQ5G6nY2~1!DAr}bOA>;y)kc4EyP31O# zPD2!`tyZaEt9@*(Rjaikt%9PUk5;@PwHMJ^4c?3Oe#!e?d#`=Y&Y7gO@ALfL_xelUvnNy=+3_h(Px%d(@bb7w2SWjm-`OvP6`A4+Jj0WF#k8 zoM;%vS%%@c{y+Y2j&3%@{~76qxh~NC|C0v|vop1~|1CA)R98o8wMLp+G~vY9y0#S$hm++yKyyn|O| zg&M}<-#B!hAoGlKjUh%bHl9L{`G;%~Xs~_#;Id%squ|!ANWv#m(micw2iq^tpkUG` zlhe&epHAWn#$KI&f(Q|M=g)O2z5jvz!PtWI5$DP{ue^knWX5ElBqTI||YRK?q9?b_k=9BC?=wOG|a! zD3Mn=<`@|O;t(W1hg!_l&sX{!KKPP{7enozHMKJcYXa~`EGul^W75E>RTo8mY2UAf) z)t?kapGeH#_?a15guBPTnKkjEV;MtFNz)VZ}}l|D`;;> zA576Arf}vA-0@zH;oH-=3T9e>U3HCqI^(zB)fzoNgW}Oa-G6JX9z( zDHNIaQ%L3$sGBOOBRz&U3Wh!l=hWL;fY5NwAmXcdYT zqP39@i6>SguN~d%P}Sf0Uv_n!$cN+ZP&RN^l=9Dl_Q`0{x*rG`!Pp0IgIB+Rm@mH8 z{Xf_-wX!VxlVI%2;GwCNq~M{c%jgk|OBl{EC+t%%XPk!0{NCPSi?L&3O z?fVu}RilrVy>oP5vd1vYNPoMVcG^$-z6``UyutQ;cXUhKzAp#{l72wuuey5Szxi{x z)#UF@fR_0WlIw^j6Z<;9yeRfhG@O?n3IHq%M&Atvw|)}rxELWLkt*&K`Z6h0eMX&E*ji$WiYFV~-WZo+yajLFEa>9;9L(+DN5GU3K}l+(JcZFNCq8 zI{ev6I|f6s54Em?+b61* zig+kWl}biK&HJ}(MSwMqk~_3>;e{*2qFE%dU04C^utyF7v1lG1{w+^KAC>u*vj7b> zJ~WK+Mjk~{-LOjup7#5MvDy5wLl04nWbfbfrjeCuME@{JFroR!go6GpTSO@v(o-KA zf^4W|zpq&QTb7E*2nNj?AEH?}TGbN;-c&BiB@Kv>x}rZubf~>uRC>4OSQOj;@F^ng ztFUeHr>c@p%%^b)?SJ236e;_YL!zF+D5an1k7)l87?Rup&T5=EiG~b*QIoO#p?2@1 z#Z(=m!FVD=aHHP}c05R)xz{JM?EENr=ON*$)K4A~p4tgvhoZZ{gnyvOK!ICNF-}}A z7oaw}U-TIIAc3D~1Q8n@)8*IOi%8lZ!NAX1WD7^o~WkRcsBn)-57(9iV z=MpTWi}5h_D#dkB$G00fs{Sq1PE(U^7A=k)f0zuC-Icwc(tQ3g(kvHg@}%(!+R^GB zM`zSI9`e9b5UVv#1i@lU5`6^g|Ih^V1ESVZALvA2)}q+wMVQ}J6}6+%z3D~md1&b9 z+d-h2V?qN0jU3}M2xNwN4hXnI0r>=`R5aBJ#r_bCy)HVK5W+bk3u-x!IpZT&)LWt0 zeyS@kW|OEW8eOQG3euBBB_TtqqIYiF@nQ5Ta)_?>8|ZQ9suvMYEL)$Ccrmxxabi09 zeAj&N2+aqN1!G^*eDFBUhCB0P{|rG*OpUKd|ExIn1Qq+?637wS7GUIyy%cJ{BE975 zP`Y2}je)l)_ILrtv9|ASeJ^r;^lQ_<S;5$VyR_F`GGCqt(X<}%i z#oUM|XZAs`eF05N8qx!y_L}sJ5U8wBdn7%F)XyVpi*3J+Qs6ACoy|PiDR$iKjJ0DelLRUIXp<8Sft#uC;!BPLb#?}{i2k? zjw{krV;^Os9lux9D5Bt z70rx`4tzE-`03k0sV{oz)F3GqJn+RS1;ZZAj~$7+%mg<;$-q%zlq1kuO%zG#71nPab&`9F3l_?dezJ zxtB)o5cUdoAP@q0qlo+Na4|YuQhN?#*IuFr<1&Rhp>5l*iBFi8>5pKqlymfGX^a(FTlmK{;B(`rCsiU8d z@L%-=!m+1<*7YJfdcX%|NpySv=ogrTQFQzLlKmU7(=JZzA3|pFb z5L2|^f!Dmj>M!!mmxALBbTYx%70DO}WqE?J(aCKaCwCNF4E%kV8tp`uoEAFKPH)|T z!@fE|bx@&mAetj;)4%0T(n9K`TSgRyO0kWWs=@Z_x$M)B-*!REQfw8`(a$`qE~0E? z&V}a3`Tl2+WkKwh!uH*={t@*qn-1=Q8fw0(w>K$0*s&5h-7j)F@r6Ebk)?g7U9P9? zwK}$}WS_tFll5cre@89z9bes!VUKP7)B5u_eM#Yh*z4`Trw-UZ<%PY-9d>#%SS>w! z>;4Tda#tpm(%QpuY7d?8$ZqYoG8lb?rdg2kv40CKT0xZRd;h}$LSt_g z$NnxFM1FgPQ51dL+p)Rpn{U4P^!am+4Bdz;@>c9ox#~LbcIwYJZiIpbj}~=QctZYy zw~hTp(Z5*PpA-+1GDM|qgIt*+`*}5kLquey1dFO)3dP)zn0krxYYMy!2 z>VwqkOVCg&A44kEII>pFmtzCb7W5@-Hs)WQVvYy5>OB43uC52+6kYH9yl#iy&Ne-gl2jiAeW?g>l=2LiK={?`cRB`umk$Z1?fIA%V5kn00dx|44$N* za@GDF_urp6onq|2vEB{Fjs~lr69a=N#wCwME{uL=te?Qy<;RZ24uoQ_V?52?zmLq; z8N{qy&3|IpVWTd+{j79SLH3?lXSAKq>0^KFo;V4K-+9tr&v!GO>}WBt$6mquQRLY9 zr%$@NM7Hl-PxE@(-zs`o4JUf*!H6V;1v{`Mf_;^&PzTupV=d-~=;}i4wUw}fiDt#!V@HZU zeKT19tjPDk+umUP6N04thoLqfiC5SxBtp9O|(`!oDNltmTf#2O)2NU2!-&i#m|{g@kQ z#md{3JaE#?vRy1jXbOx4TY3885at_sA=GR$)oh8_ecnMU)&WTFY-=Q_w z{5RSwywOL^*pUNY4Egj*Y<<2StMERQfQV@w-rMnjRbRuv)CY#~|MrSuC}}8N&P&m^ z#KeTxzhwqyQPF)gMK&X6QJHe&43RS64y;|UPU{#bgccomqt9NN`^F9x4SVq+yl*q= z@}pN=8gf&(WS^LSZ+S{V+;L$>FSe}FBgn;O>`~E3 zXqNoIM_pZx`?g1E6?ft_7<&gsHviVYgDPnMDJ{PXsRiUAI@EDn`bKE=PJdZnqHy57 z54;akGpBCu8ccP9)g@WM_U4R7B=~s8v;_Z?wv8}R3p`PfUT%JR1dj?>{>s4^xI^hB z@ch}dG1Xq2f!#@ARWYJdrtKA3?QH?nY)0puv_2v!L^Z znXw6r4eqyTc|+Sp7!#z>C)@6p4gecniy1(>SUrvt8z26TA0XrQ`{Y)J+@Nf~j@E_k zatF`e|;%fTqY&IeIj`Fo`~A1#i3wl^8-315ZEP~#44K(Jn7lM>5FDoZw2;^Zt_ zXw-(an*F~mNRRlR5|fjy`(d2sI>?Xsx6TAZ^b6C!?G_N@uA>bc|5e||y`$xu=r?`Q z8#ep5eTi`PdnfKi-e`yDKAIu3#QzlJltkZ8jDFEa@|}c3C>ehM9eq3DlB2}r-%Kty z>}c#|VwB#Cdbce~(`EA6wV$)zonS9ORhI;%aYT{*4}{VyWPL{;Hw$7|85DRDv!Azj z?Xb~$)d#RQ@__FCZPOq{S%-W@bd;}l4&Yq2j)Y-PjEADauVt%jzwSn)k|svu&7yhp zVx%?dK-8E9%(hq*K-ib&TIg4{7!Y!zRY)@Yj~pq?ezGtdYfe>D_HwiHeW+KE-i*#N zwWIkfs;i-JO_6_r%sRjR3mOna9w+XA`>65LwiZ?V2Ph}4EDCroV6S1jO-0lWAZA6# zY5Lz_UD$_J1?w7!IDM|L@l5G?1lYR!J)J|u>J(UvbUCxiLKEbO95fxN<^ z_77L_|28zt7yW$5>I-<2K3M%^uzjFfEZW`OAsGBbGK5e!q%WjN4o?Rk78?(8Nllje zKxBxS(>wQe-+vKH#jk@M8=B?X5o^ZIAJV?#R-}3?G68*G4qgL9Qa{;xJxXr|W51z} zA(9r9b00bX601fU?>M7(UXykZxgIhaVf=UgAmXuq5WjzhIk>ZbCN|D!A3=2K`LP%C zW6xkutvL3qkXF!l8M?z|*e-mvAhtLViZy2x#MWdT%A*oP0X0<#qCI0`HhFRI5IF;4 zCSlycWTx*V_z3zIU_@|mfQwAhiDQBjfYW6o%F_3!F zjijUrfUvL3q|Y$CgA6O>(xh=oMFR|@j~^_Ckw6a$pEAI-Qj(G=+C6}G-K$*e$%ac7&^14=(VHgueb9kc8N7l(p zLL=%g?3zz;6d)NCH_54arwo(1^sGz)saiB(bTSpYP-FvQil#AwQ)MP-^_nGt7iqE( zoJPu?g?2RE$ym2i2u+bZSSVNQv>d~j!RuiM8%oKIGl^{(o8O{be}T4 z^oCKc1;Je5q@9?Yiz(7P?u#Iu*F!`zrJq+p%ofqADyF4a(E%as{ z+MhE#Uit9JhlvWOI8-!5di&7lV;-Lf(R|eC(>@M&Np>u<$!i?)2M&1yk$rp#zT5Eh zNYOIsep^by)LJFwlouu`GU2fzn><)zlTVO9p=hdaZGV(fl*G4g8(^j{Cl((w^$m?x zOnr+TroJ3Qe3qZ!U$<#EC>QohRW0-y~o%RX&j-RYu~>Kia8E<{%NL znk5P;rIivcb})^^a>A1(UP(B8%48Uc^N1cO>G>-la+ zr=;P2Ofp5@NtvV*(<2TDQq)lLd3Pd!u^Kg&JZv%e{Y0DM?h$uO+`ZzCksB8VZd{4t zzHwtfK2xPJ`<*=+aneze@7|#lNWO<;O9hheCDJz z&`8OdgnO#jf6iv~FrxVSJ>F2VdSv;N1^=nyK1kfp7WZ?+eVDjkDDD@Dd#1RL5ciSd zK1$p#758!Co-6KumP))XA8*OWyYjI`Ds{Ddbjim?k1U$MY8Q$qO6l+TFFb{_c>UMj zi{c5p`ge4QzO-+u|H(gr5>3SaltVuKj*UL^C9x*$gd75eD`8$qSx}4!pJF6YK1t}c zMc88h^dCwGB(r>$a#xP)f4$0%_?zRn{x_%wJTk%GZv^d?bf;ubqMBT(aydoja+d!? z+Fz24|Imb;)P#LR`mwNolAf{?^nXnFV52{IO@i-nMD)K6BtUpX#!Cn%{T(;@FG|J* z7<{U6F03l@Jk=mi(rKB`sRlWz%tzAPf>Z0Bf;dqrzW&1&f*4R&WAy*7(iCdUT&&CdY~XCII%oSg${<}H++j2R>XsWNby2tZ|A0|tvgKn6}10oim0 zoFM{PGUiMX$dQ4wL|{K>^c@j8%%LG7bc90z5jw`9bIt6&hH;!j>E>93IyrQ{(EURW zeOHA3$)StPW~llZhq6p+v>Q#SOSVZv@@5W=G{-|`ltW|8VuY^d&_wfcaPHtx(4^Y9 zkwZlyw1-2}MCc9yHaKx|SpncD>F4&Hk zLG_J>l|c;+)EL7WMh!$VTHkF1gHX$7Ej$cbsAVm3T+Ip-Ej`v+ELoCB?92Fn8g+~; zs_F&+sou2FpW-PxD0w$!eA?L8W&9;)qc_px1ylVurEp=Bm!P11~M9c@A%q{346T2c-rzV2eAi!T-z<%Tm5 z+b=ckrYc+dO&^2goNoG3z@jEg(tboSQiYrH9HyHo2QJqxDhrqE$5a+B*Da)Sx=i~M z;^8v>l<+Kx-%jPtk@Ou@Py0EupFa(zgBj)es?*skVg@f`IW+d1$&brU-{@B%HOZsfq9$!>RW;591$5ifhz>r^T+5c<;YHt#@b z#GsINk4Z-5z`drJ{>Yf$ia>%4JSdX*q=9~m)UtmQ0u$1nHea;`KBEi#gZVOqdu7In zX-7?(!%2xR>wL#dnk0E;%%4P{j|{vj*jS6>B7LINVmw4?T6ojmG;3|?Z|TxIMFeV> zw2X95mYnv1xyw%Wp-Ha98vaAb@JZ#pX{P6(&FAq@?J%DuBG`Feu*H)g!+Rl__e>(q zY54U}C>6hGYgtYKCYy*Z1$?$(n(m>l=q&O|GvuKzMB*V2SxC~w9vYC(YN%~A%wnO5 z#AkSf_6a_6)&!pkcl?eJ`k+S)zUDEN`-3v~C2e(v`JjiIn3VRQkOl>z)m}}jy+ZO3 zYB%OX9ugA}g7=BE=L`vlR~hD`9-7U8UZZHzf^2@SV7^f*F%%Vho&+57M;F@YO=Q~i z2n60tzMURvHOyV_QGx^?b!`bgY9`X8mT6jZkW!e`64sTb@S4;}xcGm!%ttV=o14KY zqyKJEg9?yP^G%CzBZ*kP4@z`KrqtP5ZQc#YqMOj!T21{Gbf9rw6wA6@3O@msp;dK; zbvx;QKK>il&j>sxJ+h+Nu@o?PLVQq??M?lACW>q??NgElLttcv{Wff^#PcKrAjTw`ARKvK3TP87S&dOQkiot zYG4@;AdRfva?7b+NgEk2+Oc!ASV&qN z*(fxYmDgyIn@hUM5+k(GxY?q%ov{pQq{b_)Nr;dRDQTrsi>8yLm9JdSP32E2=j%mN zk-1&(A>&H=2U;Wifz}8mJp|47hq99x1}BC+UltD{)n)GTq5u3Y1X*5z97_b5!Br~1k)v8_k>S;pK_Wa>UdKf~ zF`3Vf^~S~0KJUxcuej9H+(o|($rK&!`xbSy;$owA(pRV5FLT%Hr?F8xy~0lsFOAyi zRYn~{Y0MK|(Gi0jE5dJ!u(k8S4LQOx?|8+m262+#3FnAT{avpzw2XhxmVb$mhxZbE zT}sa!INOtXb4m(c}Z$%ND@D!&q^4&@hv-yN) zE7<>66dC8v!2Gl4e?>4UN?nm*CU|=AtNwUN1V>s)(L{?Y!AEmT*+&1;L!v@3iZ=Qe z<%`PU`+Ds*&$7hB-1Xn58^&a!&Awh5|L9U-)wE7pdR(qa?R`IQUJoRU}-=Z(e6@3|HJC01I zU*=j*?&FN*?zJOjk1(jG;d|*>Y@tDRQ_d7)>>x4OB;g~c(5QNvsfN{YaqZ`9bDC&7 zPQx*#Q%dtq(;O-$F%)txa~GkqCf>C3QDNn3A)jf!Wj+H1iz%tuDV9$&M6)_!UPyAM zv>E0*<}bja4bD8Wi5VXyjB83cViEDVNwZA45XM5n2~*3Wm6~W&xyVOMA5Jlq^B(BI zd2a)o=p+wxpU51TBlF;i%%iIN$`Zw}gQI8_@))f`JUjE)csI#OE2p;~=B|&Cm+pD!&?2L1oaaxIq#XhCQHIr`UuT6Rv;F(h2ghJnEQnucm_k6Q{iYUbW zCaH=J)xhx16fe)WT7S=oEV{xrqONjis12pMa0 zJ?nA_Cv4;qr+%%lQysBoOGk3ThLC@Q&G{!6rxWhYNndekg#^!Dse5H4r87FX@& zo;t#50j}E3u8wfC-I2-hD(WFtYv++GFQw8B5hmXzn8>HDve~(L%mcR=bGp=UGqyLk zeIBgBy~euSYpmQ0L3Sd~DPm|GXUc)|o(-}+=i1dwdW^S2_z*`lNAu|(TID6@aI1W} zd#e=NWXO+O{=VY6N-W&Z z86pPY?}@zzwZOj#eCM9W(r!|G*zB>WcRpuGGhXePw_C%pZp0;bvfkz8`C*mrUD0v^ z#9_YYp`A%dzb|Z_(FQ)b8SqbScS_Pm#&ve=#~xaQ%3es)P(XBi{luQg5HT>MShQ~A zeT~z!Jp@T3PWs3p%kEo&*_XL%^9Ascsut{`9kNvKD`wb-Me&JqBKeVina^6OLs6^0 zVqDbEguNWfcMtoN6l>{a=}6MU)Y;8$M$GGaX3eL~F!zO;-b?I1RdM5fqbO!I8_e7% z7?ZAa1R-Z09yjh6{u%MwL_x@zNDic5<}239^KtgUSHPtOe5gFSCXx^7m$}zEK?WPm zxYS}ILezjJOlMe(0{4Nj@Olxoal?c?92KYIgu6Iq!d@ou=@{ktEYeR{pdy#4NU7mE zg>O?hw5821{W5R07NcOfBN@*Z!iAj%;z`uW{ujRJJQo;Qbz{MJK~ae z#9n<$`A1x3sf2NogJnuaq3PjUQTJ^kO>l42)`K!05g-HdaA9VXz3`!;z zd=&VZ9{4XAm`yQh8%a)zpqyQjbBp8-l~|B+yX5WW>_y>Je*l#)QX=9^O)0v#csIyrI6a zZOw?$nWHnuC?Va_cMFVYtc}#;zhR#qS54}+)I{o6)MhS|G#zcHXmM_y3`Ev8*S3O$ z%8K+DMr))7XYT>F081g5TQddL=EyQSz)qzA(pKLjrO=UkwGoHre8B>t_|y|I5LMrZ zXCHxKumO#Xa+kE#H$;ZlH%=gpo0}RMfI}HrNC-zV6p8f}<&#I{i2{;v(f~}TUZj$j z^)kK$Cfxn^dEHc35o@EA1iQ_pSQPz7?x}vdUVy!#efks_m<+rX9Y& zSSQVZZ~UaPYu8z6C#?~lbhD^!ZnVw%{RUruYp`#};v1}WxzV-O9hdtmmt7jNIyPh$ zt%|m_O}Ad@v)TIb<-XkLGHcU@&7oCRmod%yYW=iTTUJ@$fPB)MYxS+PBDq$-9o9XU z`}$7^hT44dYpsvhPn$k_P3wg5*7wY5*2(qLW(eXI?+)K}*04G&d9#)0i}*gaI@Y~0 zpeX&j7>vO=+qk(=Yw?b|tpD0@*mFUeb@7h7 zVB6)D)^Wpkaz@T&*`Cn@=NA8B-a@PO4eNz9o-A{~)|x$0tJ8DRb79&Gch9?Y!cTtq zrd4%xj+H;n%AGdHDx7AG&z)XeWaUkp>)RLIXT4_RTDv!R&NZ!E~~T7sJmxjeQQPbh4u41OVX?(rthdP?a6T? zMvd6C+FI-D@B2Gy#_F4CtU(mcZ>n(4%~ql> z_uA0(iFYjUt(+Tr(lcU!=YoObi&jloGWYi*=GE-;@4OkeT5B_Bc+Nk~`uUZ31eGQx9yn)UU1RE^btn$>tqXW07371O*PRB0uCXwqp_B3x;G&#Lql1HI{r9Zv#2 zh7TJ&@TSNd8JItN{&3&;>ea*NKGiaB#Prs=^Q|q`NwC~_#SU)}2T-#ONSb#>OBK9yFe()x0JrM1_* z#X6_%Wwgu9tGt$V&HBoh$3f&t`1#En&`n%FXSemfad>arIIHC$E2Yvm(U)z#==EG= z`pT^29oDZm_>Mkh6&?0^t?#WPW$sGYVHM?yAeHuuK0B@*vB+9GZN!$mDS72ttE_C# zG}Bu5OY5j{a;x>b^}dJDn0yf{yxF(an&S%`Y^xnV;``9eGt~5TPMJLn~C}btpWnC1S_sxVq|Lzks+$|TavPyP5YklAJeAm3}1K-4X zR^J`g>rwxku0&p&Hh6}Ml64soSk*Vp%85j+w~Uh?TUTwMdOLW< zNvp-z9|k$N-nV%X%JG1C6d{P%jKF4}XOg*f>UGb4zqM_YZ;G}0l_W>YEw^byf8ZZ7sEd)%B5Ofh8?X%W+^WUsLA| zcaDQ4-ln?1(E7lVwUOFZkq(mUnpy%Ya9V8D(%L|C)!K$89LqYTsIs{5(m-2lZJ?^T zxk2RwG@Np=MU!$%A1<&s{?dwY#?K3>##t5D^zO=G&DhM z#)_&n$Y|I_Fib;3Akxy-2!quI>LY;+%t|nNqjdF+0d?N&vSEpaVj9uVT3frEtR)Zg z4ba)PP#};|S3@#cIiVBj&0Iqp+5+M@Tr!YKLe*1SBUwwTS|asT4I~K%^fu#oVN$$4 zSJlZd5{7F=Q(y&74;Hl^SiOuguU*rOGk?imq=qZO6p;tz+EQD+N~>bj?a)?RO~c`% z^1~RAC8sNrM~iQ2Y(#z}Qo2;2D&mMz4w?b^%HYGCB4LiZ6ut;^$l@6PhF`g#mX1Ar zQdN!e4|3EMRS~0toeJ-(np%vqw(4p+>Ufgy`%42e#o^0=rnU&xUQ1Qu(po!CX~Egq z_?#B<7aW2dsiy{IynYi)WY)of`U?QGTO3y_=J|_bf9!yraDzRGeX{L3~e1Tv~~EdG|Fll(b64HM5;uRSzcN(W3nNN4!4v?IRl8LAqXiXQ3%zNkZ7gYMtA!UvFb&4>bac_LqcPtWCkG1PTi)z5#OWyT|Nr`r zEs)A7u)q|TX^7P&hr~m%;H`?dO#D)hN%dCAG|Ch?(dMeiV{)nul`&;M#KrsvrRI~Ja zh+fQ59$wYKtcuLAp*RimII78JsZeB_4VABAG8IjRuAZulqv{|(Mz!tP9UeF>(JxSfq0uI@NN)-8~4TY}}OLoKf5kHfSX2Taq_XW%g zLT};N1mg3%^YP zl*OEiEu)|J(e+b)_Ehd|E*=rBTzj~O zBOkKURVeax8!A)en>JMO7L(`WqZ_&~dr;(sHWW9*&Elxl4vQjR#M=@nXyG53yoJAN zMi(mMoVyZKZwo3{CuW>BOyOr{&mU}il#r(>-1?bLCfT}dg!3C(QY#>*e0Nn=6}(T3)_3!-FyV9PF7 zq>}A1c2+9kj->M5B%QP+%~GT$X>q)yxD~R}Nfi<^T}3KMrZGHmOqVXN(FSx4 zhkorOm(k8$WxB`Cv|N#k?Nkfm1;vdZO3;J0pjnFi%7$jg3ySOF;{}x}L8=^RP>;k- zSmM)Fs&uc}3M^9OJ2q6J$Pa92ky7(2+XQiI`S|SSDgkHNsp1;TBb>)EJFgN&*4n8S zs_b{zP>CXy33`|xsO(j0v^uArnNmFeLPf=*#Pn!v#iUiOB9&;%xN?85`D?!A=24EZpJ-vYG!yj*3OKGn(dbD%IqA*eTo3ET_{CP;r4pk;C{ma8O;5*$kmY z@3~@k5r#6z(uNks3yParRx-EJT5n{B}h;`53dgjaDMU)p)i%4GqC{PY?-KU<%mWT_7=O=Fg$j--CZGJeiakI`Z% z`j{=hT#+ivz8G~{jB^u@m5tUFimtTFxlrlm*fh?`CUgGV>{N^5Q^gJ0 z?))(YbgTFm7TjqUutbrnfN0I)bKGu8k1+rFtWbh+rLi8n^2)xdEDGERnLmQ%20cD-lxS#dqoWvs(0+c+ie?CM-By~%$;nfiZfJzqe3=Ig(Baz zp)z^i2;SK6i_RWKGbLz=ovK`s4K`G&$bZ<-?0DI62Kgm(|J_ctFg{gWy&aEBRiaWQ z+vOp*Ue zl%N8erCgCaY-mBept#XO37TrBnx)7R8!GQD`;g62s>oIwDpTZY8>&muJA8^% zS!2Xeq@zWg%hYl1DwiGk9U>u3fgy6^a~whN_7&MUMWCgfRW+ zT%V9Q*b`qB|LXz=;XDVrhTzu}bio)e@TBLGvn8adb2~%dLeo(!cs@UqG1P~?(|X*K zaPE1&-3r~sv56vfl|gZPIg@AjsmDo;oO>VUQM!7Jk#Uva=F!UI2$Ixtr4C!eV`T4k zn}aZA2c;@u|4!Dov#gT%FO)pnWm(IBRh2=1%aQO{CF<{NBS7CUIg~xE2fu!vS)5d* zDpfx_RcU`FGablX{+aAXwfscmtYFy-Y>nb3D`UA?EasQ;TvJM&(_2ri`I!{|Tl);U|o#^thQ-B(?{cR=N?Ulp4nx5a!PECoJ}7 zw)hf7Iyo+Im!XF>urg_h-Q&zEWtnZZ>{*KJV90~nzx#4aA|7Rtf0fQ+nTi)HHD#&g zws*`@BQ$2Pni2ki7QWuTRgm7>Hf5> zdx;`daj*`%ZG$_<9@b6n3`IJ3mI73n{>vN$r@K(?Y_#9<^As@(`PQ)Z4!fH%K`@>d za5yBT_*C2Z7tQMqSKd9;sgkDD>n+z`#EFXQW8As*TGGip3{=>IEq1hcw-sM2<@+(1eZI-wd&0>za+-50J%Y z_HllA4|Bh6r>aootRYfYOl}m}XhRk5awtK6v;~zbGGwQk-CL@YcB)y5oNcFC@b6QV zs#NpsR15!os!Ek=v7KtszfUz+rK+`4h25z>;_{qfv&8jOi5&GUSd{s{T}{yWzw#^T zv|%_m2HPn1?*v+FBjJXorAupDjM3OHu<@qma7}G%q@`)CL1!b{IDWJ;60kw%8rmS3 z>l^DD@OvDCPK>j0`VqoAXg@kYKOvF7iJ&vc>=>09ow;O#P%PZsLVsLlUOrWMGY62Y&m@p~bJA3&I8 z9so(d(*gQ4NEAH>9a7g?~44ld@ zq6|8tpY#)aIJKV+>es?!#GjeK0b*6cbm2(VQiJ|dL^!;(v8`Ic;tx+Si$TZA(C>(F z$PE3pfN;@FG`8yHP=fxj00mc6wb0KU=`RdWa7t0A(4d2Q;E)mW6*>YKw5G-ypf|Ws zQE#o{ZvyDdT%DgvZt+ulVR=ZPlZ$PqZ;hbo0;B^oCq*#%pFBi5PTHyp61cd^(s?15j;vA0NW^=~ABw-vDo>D;3U4S00De2kR1b?(Xz=^pakE z9POl()c-X7Y|gKipY{BV^3$E4`s(*fj_=~ENmaARqxtPBYQ=hyI=5Q82_pn}{^->=7jmc+dOLY0r zJm?zCPxUQJ9}de{=dRKzzEaipX&9d!zn5C4o@B5quvjySBdH!-XeZ^=1#BPzrD`!>Lpt; zCPzJ8A;#ZQ@t7>prCy-PkaPbh@5+C}&*8i$oXt~ABW%L@W=dgBunc5 zwERJw@0t8u&d)daIgg)J{2a>9@AA{F@Bg+urB{ISQ+A!e_EUCMc2{=o$MMRp%I>Nh zs+>WVtIFvv&;Q%`Kg#8JlAm|*-lE#8KgJt5YP(78{3r5q_BBrTCO_Tf`+r)#+Kb=8 zJKFzFKljG9+O<~YcbDfs<+ts^`Y1apJLmECkFv8nzkip0tt-8fr*^{K@;>Bx`huS~ za(yd(lzx?r@8|kg`Yq$|9))xM0S>GDD;fX)TK;bR+~rrB z%ll8$EB%!mRbG{^J3qC}sCH`aVtv&PltDL^bw{)GE#1#A?NgUv4yLI~%+{rZ}3)gQYVo%8O=9r4qp) zhS*!c8GThSjI(`%n$-4t#KwzVPLT!nuvRx>4}$h@gyNIsp(@CXHY<#9^|C7LhLCo` z$l>a?7VP3Rw5@1FHmj?a*S0l>Te0Fsf+qa9rzYHOr$NPby$XuOi7VKw!Lc?tPikGQQ!C9Va#KxPb*)ni@H^CjzNn{DFKtAwuxtxEZ5!%U zZE~qfFPd6h;%p0r!zHDK<>hn3Q*h)>dC|-n;V|lK1**Qal}`N;PF7Ypt0aH&^ult@ z1Jni{&W#RJEv=+I*czj)QP%=nb2!WjnyXT+uBwkveXhn~mQ=NTFc-CZZV}YtoX!EQ zXiT`Zx(Qo8Xp^o@F{FnDdN6FojOjCG&Y1yzeP_^CLf?+1W=b1+!bb~d(&cP%?18Ht={E5CwbQG||8rX|> zj8#5GC9}sE(%Dg%mS(3vw7WJs?-Sd=@Hkb+wEHiVH|mzIf=CmLY!0|ziPV!t*Y>cAM z36s}V)l^quTbgRYrB9BCDA5j5SMHw&mf+L~7_ z6We#nqBCfq3CliEIX}i1Lm3KnFKuV5PUlnE$qUNLXO@(gIrgHiSG+s1`Dve1J`@R5nQ2^*ejNB)O$}l$K16{CwgT zjb6$E#rc(vvG{#ZmgxS3<8~VkgELFI8yBugZOBFy!ok^KXihy?TFfsd&n(73P*z4>U`y9t!G*(Z@`Xl@6D{|!TWMY+ z23dQgRc|UHE0={E(9E19)Sl71V-8|xg7zr8IwPap8<| zD%%S5O-nHk)ZD{vWa?F#o#jeQKUc!tnyYHEh-E4z#1>GNB-L=#;G_6LfSt?r&s#aE=%tjUhO313R zucv{6q~FmpyZ&FCShx~UDFP<#_CnlU>+R3vBAuHg>TZ_(S@ zxuXGS3Qz|`E*V}@yAc6$Xh*Re6Xb5{iw>!xs7(Y!+2vCAf-sH6{i z%qc~s#bOZ7qI>sdSc0__vCWuSRy1`+en@NQ-F#Jl;TjIt(YsyL0L?C(_o}vnm{RlL z4<6JzjB1+_CRQ))ZH(vS=uv3_wLIKLH?-6h^^Np#fNB~=nDs*svEGr^vioG}V&tew zg_%+`gXUAx?{JW-vZ`vk(28n;)S~${jdQERG=YFCh)EEdFV5H`+U|Vl{8ubkb}VG)OEx82^O9sZlRflm4%b# zDq%7QsMoKn$I{5jY9)06E%i&uD8i|EIl(e%{G(o27%o6_2m777Xz_J8q}ITk3J1f| zoJzi@*ULfYZW`fLk*XyaBDpKE<5yzF*erC$gkn}jVFfHJMh03ei`o#aRLp4MSuM47 zVzIxR`erIE)f~)^Pw@HARw z4UK5QF`XlpU_t?hYZ`%b?bR8h_NbdZ#+Fr%HLd-90#$-sSUXu^QiYj9W0NQ{b%?a0 zcf1Miyj1QWh>Zf2m>k2PR_0U~+M%4a*;W*-PnuT9599NLI(j88E3JEX5UIgzL$k8% zHEHVsmX|%Alb7msunlLHHsLG!_*cQTUQ0Xc%;I0>K z7he%I8N9Va_9~u%s@o3gQghiALB&FgtS z1+SM$9({vE*KxYdP5IE=?%8HVy`Cq)kP2uA;kb^-hf#y)ZA{nE_X(3yQm^$)N*R2O zH7O;~;hmI{vAs`zO4hc7f|Q)-DN|Dxdzunca)9KgWPk&lNHHnJH#y1LW%d{|jowgG z*^)_bT$yweWvd~zh29w)N8e2u`Bd(eDEEw{Rp6j<2RXixJ_`^!R@gcgl8yzWV-e|C zkh0OV8b}vlE-iyfmm68$ZpyD9rNmQ(?4~CP8{N-wLn#hd2L2yrj6R(*ink?1Pbu#3 zZtqikt>+qxk{?6zVhB%1^go&RE_yCX*?}tR@NDx&`&gGjE1%GT_|B5wgBY)YHXtc_ zN@YsPH5SR;mf+b0)@h>N3z+X0f{z5vNGYL;_grJ!ZyEE{OCC=YS_Rr5B0tF}0CqLU zUrJBd?;1}iWpIa8m=f6TElA1OMs*xbn3i&6lWF}KT9V=Nwd$ox%t6v4EN33&134Y! zE88uwZX-F-K1C__csw$3zVZ#Q2Jk+!*Gm8pKJmt*uH1QOZdl#V?9?v33DS)2jFKd|R8Olrei}2}C4?aDG{ACTw+=IVN zA%7uxhgn_(-*-uQMYjJrZ6u%k4@NYtnI6cS9Or+cEl@ihOn!`O1>J(%JjE%2sI^)a zfc!0o;~%DY;ctsmO32yBJ3QM(y;GEt*}8TG#!fsVE%LccQ7yF%RhgL1MT|_*Wo9nH zvErFEwM*JCk6*Hcc8D_tkAy^Ds{`0XsRc(9B_{FNnK|8q*(#{y5F;cSnGund6wV+7 zWuoJ+LafXW0hLau)ZDg24%fO40A>HKgH_@bbh|9wL$s}n6UkSs!219rv#}{sn~Cmv zIOdSpx|ULEG0AD6R}BC2D*zGXV&oS3mB#_~x<$oNAFN;Wwvek@hmAGQ%itdV>?MF8 zdu^kVR=*fPmnNmaL=K=81mtrct!hgt^ z@KCqthfAU&H;L4H@`|jpFfta51AI$ly z^a1eE7aZ>VzXs-(3CQ@I^H-l!5=NJsHwge?Dj&gw+gfrgT!Yl-g)(TTS8@jRlK$Ge zWrE?HPCZmQ^&G0#usxDj&uBIJQEB*hwxB>Kw3D(tf$K|DEIEycmye5b=b1% zK4}~y{2nf{SZ4wY)>Du}e|-eG8UfJaLYS@@c#3*tJ(YbZ z&Vqe3X&GE7SCnPAI#HXSzr~K@=Wq4m@SeZ5vU>Su%@R8s zE+Gh7q9^N)&k^=Z6755eS-^Of4uY;?{00|Z$M_j8d^zJG7v3!J`1aMt{8za6*D+q> z!Z$GPf{iUKKj4apF@D&EU(0fS=E8r#{8zj1n;9>0;kUA!-7fsU82^6_*pLe5yn4qSOxVscCUuJ$Dp6pbAVf=9$k;LB^ zf7XScV0@@}I*}hR&eK0T;$z0MUHo5)aH0`#;iec=lZ-Jg{1nFN2Z{RCkMWrBv3_9w8(jRvVHq^L=ziS*{{C8H;o--)lW{c;jpbyI z09TkU>7`!qS9-zU=mq}>IO&szCtXM6!|-CVNO&qw8pWPF;szt!lRm?G!D*kgC;qX$ z;M01+7xaQJ=>@+WIO(tc+Je}RhyGXh!hb_AIQ@mDp7j5(UhoHc!5`@bf4Ud^xnA(2 zz2L9*g1_4f{&g>S5+;^pH+8JL8kf#tJddZcL)lM80`JK_^jBwk!b82_i+jP_dcm*g z1>XXk^j9b9{(|+SpQZMs&+cAu`Wb3Z{IpL<^3@@e;vE6;Fv3w~)YIQ{9ap5&MIf>-u}FY5(g(F+~{PW7VB zAX&k7+se2)(?h(cK->?3pQ_FC^OzqmQRQED*WSzW2XOX#T6(#Sfb(%C{^tC}mt$2~8eLH@vI~O%^G#MUrg6nJp2)n=M$f zg)DruKG82Sn>d!*^5a+fjUs+CVSHR@APjZeHv9CQvwkw-3?fhwcqc^mT^&qsF+8 zvFKw5%C9y;-^+;CeRv&5x!Faqh2sNRe4m962qP^uZQ_eb@d>N=qz7O0;|n@`JC1LE zS|UyKI|s-V->KHsRINoSlo($L)7w7r=ZC}Ls#bhu6T#PX_#WE!_HJK~+Ne?+vgr#R zrIGw95+aw|5I#OZneh!4-YIrxYiksY{Ap5M?;m?p%fyFFR1p3$tlRg1{LPF!Sf)<> zEp0>mEp0>oZDCt)?E@|{5OrpJ@{IVBn#@invNaXj6C!>{&>g0)X~d5N@V9`$Cq9uv zM(Qg!@d0XULoI$l0aSjQ($1F z)7Jq0f7KB4YoEX98%{{qGpzrw#@d?0vfs-*BP zP0lh6Kb7a*w8NwC63TUBe7;kdpB@)#a%OAzMH;?b!)cFQ>GKl}r@cpo->2atH2g6Q z&(iQ0G@RbCDmj1CaC&E`@GcFfI#PHNS0qK#9;?Dk zY4{}?ev2ljQN#CZc(aB-r{OC#{A&%@?URxKCR}bkzoX&0{EHbUJ6wwY$_}*}K2F20 z(B!mg_zfB!(eNUE|4sVn3lr_+lh zT%;%Mxhgr687DdCYWNWi&(m;=w{l62?r%vNUZ?TrFi!IGHGHCmPtx!zO%AQ0l%AV4 z{vp7rj_HbN_+*3?{|*f=(D0iy`Sh+u@qex1EgJqC?%b)oy5GK};q*>K$@z-FBL z;hQx6)A^MJ$=|Hu(=kOU!&o=pWme6y8PcUPUHS* znw$d~|1u5#1LHLA6TiCtqVcZ)sPuWS7yk43RU|dDts4J#87I31H9W{Tm3Nzlw`;gw z-di*|MH>G;4WFjrbfOqtZhhX<r;4ng@R-J5$2gUDx`ulP zAb^YHe-Hna{Bp*LKcwOH8o%D3-=*Q(HU7snyhFqPtl`&acmg>HF3PtU|CK&xX!r~b zKS#r7YIr{5R4&~KcKblXZ_wm?!Z_8}91Tz9SJtHGjT(N1hW|*zPvIBG#9yP~Lo|G& zhEHak@~zbHKWX?}4gVg$x*_=u8vX;uNzObC|6If8YxwlD5Wq!pZo+@%CwFW3%^Lm~ z<0OB9hQFrq>-Ox__!nyYA87a@4G)}+04~z!3jA04%++wce(N<{uisUSlb&Hs&Mu8# zpT9k%;a6(>2Q*xl{|e(I|6Kg%;uxJ8zF3pf=Q{}CqV9u8Rjx$Fsl595o5ncFuhRI> zVVs&hlc2EH*5tGytmI#>;q4lJtA^|4{XoMb8vkiD8O23M4RtzLA;W4I`@Z^?@kTBOw&{6XYu08C{_Wf@EZ$p z$9Fz>X5jyuR1vsNl@A+N-^FsaHvWH+_a@*~6j>j4cWx3c1d<@gA}ALKn?OhqBFdJq z$PESs0R>q?$O4g&ge(ZChz8U<7{nbFm2pMK1r-%h5fs5~MnqKH8AJ!fQQUFmJOAo) z?ya2Ms59TZ@AuC0)sx(=`t_+(Ygboy*V2szxp|;B|K2^7y*nM*B3#C|_ptQyqnIIS z7Ds%(=Jx_8D*iEtJ4Ep`?w5~L{4)+DNAWV&k9!=9LVwYp;^OnBD(Wyi;RO|6#>D zay@U!?TYBH;QHK6amj}h6#tgvGgNUI@^`A@-nbj;+bI4GmwUeAeL0`Y6n};5`FV<8 z$Mxz@itprjVtfgVq*wAy-uDWZe7j%COTN9V_@|uDGOtebTB*j;7yoW0O9J@y2rv&SF745y zieJe0!6y}$abjB(PvrP-S9~Vx`K#ikd|m8P{63E7yNaL9<+WGwt2n&}6yL|~-XX|Q*1u2jG0ZGKq>m!S0rd%XmonJ|+6igkaJWQ1aD$U+Aj% z30xm~DgF>&cYPI?q3;6}@5}KYqId%98KL-S=5l>V{AJ$$I3>S|+kcEhf)RO<%T@eN zPFIoQS8_RGe3Gr_X^s!ZC)xZ3u7~F-ejf80#b4)kV};@_>%T$qSzK@LR6M}-bED!f zb2&b*coxg=P&}XG)0A(}l5d4v58EhynB}`DK8^LJE566eE@!afxAXOot@zI@KT+|A z*j=Ic@f_}A#bdY}|D^b-?3VtQr1t_&*KJCEEw@V#C_aqi|FYs^nSY}AEA0MC@hcDk zGQTP=Q=*!1y^we|;c{uE_%5z*ofVhu98wj(nCr<%#g}tFj8ptUFPhGD#c$;LIY;pn zj^_f!_i%YFQ~Vpw=c^RIfzx%X;@*4?dTv$xM2`OxiWhS}Z&N&m`)RK$zJ=R|zbh`! zEng`93Ag9JC?3b{QUa$#%JDfa@3xA!3xawt(oG-bGU64U(dXY;?k}aDE>Ux&sxQ0+muy`zsK@-D87xa z({+kt96iiaioeO%<8H;jVEqRbZ^8BUOT~+rOM4^vHk$KI#sdhK?OB?0IKuO|JX$M0 z%Zt8qoZ|0tdz-E}<`KfkcmvUY4aZx?8wfWaI!XQ%rKgDX=O}(W$MX!un{hr*QoM%i z;dI5X;OnJ8@e;m&%~AY#&gaF7-^=blDZZJn-|G~Y>)|%Vi@4rCp!g`xw~dNV;(Xqw zxU46$Q}Ldh4<9PNjN99TiVxxRey{j8uD3ppFHU!-|8<;i$%!{3j~DfcZ?tH*o%xD!!5B7b)I`(|d{H>0b1ms}yg|{1(MG zvin}eFW`KBO!0HMJf2nj8@^utrnuCzcNOo$^-9LWNIA-Lat!B(@NMiqTJi6=d^;*` z9t0@Osfx>ZvXd2mm#@cD6#ta3>oXMJ$2?bY8GklcahX)HL~)syb-m&@a6Uh-cvDXA zbBcH6`0r5sJeJ?D_)C2Kw&Z#w`7GCUKykUQdnqp0^#H|h=j%(x5sCiSxIZ&l$;U#gB0QZ&3WN9PaaqzryL=srYN`-lKRKmy3+QlKgMZ*Ts)YehTM* zBR((kN4Wm9RD2!lm-p@>KbZ9lQSvgs^;E?>ay^@*cnj8Ft@u!OU#$44tmg{F7jimp zR(uxMhkF%&ip%S9#RHtKU5Y30c&QH+mo@ZaS)b(3eh#<2;*WE?+FkLXe80$4{4Tyf zPFB1z0wQyx;vz5CpTtM>f2ib>xxO7z+{f4TPm0Sp)OfDfqCdp(@2mJfS^ueuU&iG% zN%6C}9XLmE$4ii=Wv9t=j)}l;)$%c zpW>6aA0^*`MbAwvH&)4a;{2bg_+ZYrTE*|w#3ouIh% ztA{GShr?Z}_?g_^{#o&3INxNvqQpn?LB=ZzAH(T+U+Edo*Wo_qxZF6)OnN_4oU`Bg zN$Cl4`DS2X4jBoz2j}w;=Axg)ol_Ja<#~5{md^^T;>;rERJxO z&_B#o7Du=f_z5Awpl^LhGPF_&=fVf`HxkN11>J(Qj! ztVg!975%-qK95v-&R{*KDL$Y1S&HAte1_tim=`N9?`bO(_j5aQp5ncj|B1Q8U$*{7ft^N%dv zo#fu(_FT5fl=RAabYHW)@CW#MY{uiaB|fLJ{2SbB1J?u2%0lQKk(m6kqm_rY)uK)zd zbg($WoyFmHSNvV(eU<)l)_<}k5B+0V|7eRt|7h-)o^El-uVneNE&ZK{iz!s{GM=-> z;?Tc@^l_A+y!u z(0>N&|EI+v-=6jVp!Ba{?(%#J33n)87s<>a20d~ewX-ui$h-CEB3TFb!C-Zu`kIOO|qe#*AY5+8XkJ5|XqWcjfchkm)Pr&t{N-(dN36i?vijxviw&%Io4 zFH-zfItOzZbIH$4&d-&K7c#$3>A9Hs>xw_b@sas2qF>hk{7C74nA;86P8#`!^ro^N z*@jy3Q`*(0JTFG%Z)f@Tihstuqs5Uw@;;}R#Sw0QZvWFQ4taSGGsxnQpUd(&ioeHv zoW-F>o(tw!9D0u8=i4ggl5bydKA&&Nn|6%b;ma)!J*BKi<`YT&T*dr$CI2Y%`xJkN z`J;*-#m|kK6z|V`yW*3Wzs6kBCEt9@N45=@ zdj1w)?^Q~FImh#S#m8}bwcOH=e316-I*TJ*dCt7a;*gj2?JkQ$elYj@AGJ8-Z{+Li zZRSW0ck#&PIG&gX}iOZ;Ws z<0llC`^!#C590F;>))&RVD48PQhbK=w|IV;)X&fOI%>>Z;R0>D_K|=uhJN z*((-@{Ab+BeaqsIpUm>_F_(P1l=E$$;xZ2WXQk%~)|1Hd<4`VWXJ~OyV>($J;Xcgr zeHH(d`2gk;pM6~4WS*e#FPKkKdXDFIcDCYUn9DpliDw$e^I|1GpXIMo{08Q$m`i*n za=luk_!Q>rm7Zr=&sN3de)FEiQI0aNW1rH$ne~6B_%VFnj0>1zFz=<2{{d+SEe`!p zd1B7d7Ki+qEPuSkQNHq?ZG^=ke>uxfwK()2g^VIIJ75lu;ryA!@~*N4T^2e)leONtdi| z`H|ws@_qIvOAq4t3G0`MozlM1DPx*+6cuK!0nYpxAJA9C$`@iC{o>!XE(~A2c1C;zqzApqVj`;87_>EKiTjpmg z-iF<|7RU9qhxMP&T+-E!tK#|e2R%? zxV>7zJc+sJm-nizEqRoSyg%$_ap?b$_4KkhV{1cnb5g zm7ZHzPrl;MGM}sTNV=*mdBpP&$8(v*q2iycXNBS?v3nICCH|ebAGk*G4Cd>Vo~zis zNy$rpcbg?|^1l&9ip)-nBZ`OE{g%ZcKZE7>GDkd7Q~~;jIcV`1a{tQt{I%jzuVT6w zZ{~55tC|5vGnah$gzM+A%%%NV$?-{5dQl4nM-=*d&zf} zJoL*tcapD?&j(mf5~o}EQ9VqsP8-EfW`3;2O_Jb|Oi#trm=CZx(pAWMvJ}6J`6!D+ z{|weM*5c5!j^!sS{yOtKi$jmBmp7le#&fJb|Bs?qDwY`7_7o zekDJX^*n0HBc6LWy<04f^o~59e#pF}_<77cOU#QbZmis|D6=^9e8KVy6hEpLog}l=;<)4<_Z#f2WG?BI_2E}3 zem^(%4_SH;?m*W6n8l%A`nOvw4*8`lzs=&1Z^ZF=&Eh71Sbn#~A^$A*m-aB1_{%!> z`xTexb{C$>pq@a#uQy!O-dh}2dEeOF;*if_`BoN(Ro*vtv^eB1X8EobhgH@|Ot(1X zH?Vw$#bK5A_E{E({O2q`PVtmfI!Pu^@w1tq!(8(1CobO#OCDL6+0>|U7F!(QUch=T zReTNe6&8oJM`KUVO^P4p_b_V}@4@}^M-^WY>*;w;@yV?JRpv-nz!NpUyOq4e=VQes zK3^#=@j0Tn#HT5@uL$=RE8H6Z$l!qfl{Vm)YDjMIX7v9v`}ebq@Hke+(Fw~ZGEY@6&=!lB|n+4pK!kKAUCha)b+6f)5 z+2aOles$-!+X#QJeL<@a*F5VQ-uQ*kYr&JgtoZcn=aM=sHNJw&c7_gDbqv-HhO=m8 z(qoCinr&|SmM#1JNsqmFLhKd6nor&8{a-&vacS;$No48jiz-idjA0R8&>jo^rljVq?D>JP5enY-KkOH*a@BqhiO+heDV}6@^uf zTM*X6n$K-O^F+!7KUH1FJy*P#JE40n&cLvf`w6DwDA<1UYP)@Ey zFN zxf%U>R}>b^&a3KOQe0ZSpijTleyJIKic9lLstXDoBQ6fw2E)4y^GO+P=21ZVS)|T} zTC!8&k)1MKgl0pC;%3SLHs9YJx7FnP`nw|<5R@$x6E~E zjn3_rm-zX{agA?iyLE1(E513Wy#Jl~2X4Q%;Fi9Zy_raLeecg5_vo%~wl90V z=FC+kEjF*6Q?TfVnZJDYV&R`opX#=JyCgn8e{j-|-!}8tz7QxKI6b*IXJ6KgH!9}M zy6v@nzCojQ#h&`hvSvHyJlf>WAJ;zGzhu?J!`^)H$#*kB$4}q9 z`T98riiiLFc4@y;E}M1#jtw*3sq7s);^Sj|C*Cns#W zB+&H5E|1PW>yc$;fyTRvp15^i-ro{`_+a{~7vJvDY1NK(>({=uz4hQnCSTNSed@re zPd|Qt$;QornhpPa?2%_~Y`XU`-;FyTsyb=Z8=pRS?#`Q!?)q+QO{@1Rk4nh@Xz9R$ zYlfUNx7pgW&smi4YT~||k2Joz+XGIMhi++f!HBDq4(+_%f9dS6+~a0L&ZpQxG z-+XiN)vx_|>$AHDoblC%r++!?$=7C`_0(PO$3Hss)QpFN@APc8JEvWf2frKb%b2k! zHtV@BW_&pD!&z&;SW%k3a8vOqmp_vC@-a0@%)Cx9KasQ3+2z(JH1> zpRREeHx1nQeD{Q>AHM4B^*v+Hd1UI{N8Wli{nZ_hF2CjNUdKN0!IX8+7TnbJtNhPa z-+oSYldI>(+!Nn;_0WvOgUe<$s%UYR6L<0GXRd9zXv5wIdOmdCfOd~Hy=leHtD0?k zR0n3$;>X z`Qwur!3XikzS&{VX>2=@kFGOOtT|yc_6)Y39YJghA4Jipu*d|lif^A&b>Xezh^U$n z*1;B0)jzCioLGl2@;UP^yjA;?lM-%o+PdKy*FPY|KcGvw)6IY6m|NwPq>V%_R3cg{ zvcqfAms6{K6S=~hBUKa@l@#VzIk=yOA@7(3HHdY@D{gs}#fu7atIX2>)pP?np)WaB z5)b?K9t3)YJ(_+1xjZA8CT=;>&Tg{;<_BF04y3vin^+YV1oCI+RfO+SW~011dpq^1 zC@ZV#Gc%92swylm!@ZI>)r-VR5^917>qS_!J5*jSHq?qlq0aeHr%enD514ywpl@1w z-?S6b`Ukq7L9q(vRe8L3zaCE2%#z&Vf&~smEVn9eW=Ww@?1b|ulD64p6;**cLDWqp z?^{K=U?dU8I?^UHoKeGvpB(5;k?ZmMacjxB>@GUPaTg@J?V2|7ucWGwOq@U8hp#X& zslLZc>7-UJoJ)yvQn9a@InEYaMPW%^YE|KaDkl{=>7>rAtR!pU%<5UWc{68L6wY^2 zjf{uP=4v*eE=(awlzE;#A?&@BS4XKQfUXdxrLO8 zsikFAg{hQdy(_Eo^5?L>!r8e+6?t!T8c8+t}8$C+BW!v!H-im zc9M_woczhl!4cuer6n9~D|onXNp_gk-l5*F4ht78bpE^k)5$Nw*G9sBMV-*HBj~(l z@G_ernlIZZr!$mJ>NG*VJLlh8P8jkFWu)_OA~CI#kn=Tnh#!W-GFo;lor@O!4lW=m zCma#B4nL0=bcXxiWQW--1)`J(%-P6KFhLjB6<=LetIR}n*?ne5D;ZH-RB)~fx>Rn5) zioAIZN^WkpObYF5x+D8T%E6^y(}Owm@GZxXREr~A{KLroM8cizVJDl9!jI!D9;^7@ z*?pGc>~y9p&fNeH76yMG6D;00d`fpZT z(z%v7#O!ier?}L|XOy1T+5L**lAga?9C;+>5L>|TFVETETO4I8_n8<@hs0B^hbD?k z{prkH^v`9z-7OCN692vyho8q-{zQvIUec9iamdR{%u_55`7Nwxti>UJ61(SF9P%%+ z`~}Q$z;!BS1zW)F^0KdAu|rhs2vh98#glQ8jMg78)CB_UXQO$ugA1w-ej1VU9Qy@K0Eq?p@(Fmx~&nvjwf43(t#N4DLURkJlF zt9C?+8yb<)GDw!pAlU{4m!F^FPv86miY-`c;UhDui&2iA!i{3O@F+aP{;YQaxZJ3OK9gXE!JGOIGNusy3i) zvX-~<+(oJK%_;pm=nLJKGKoBl2tAcDLv+;!V{3khKX*t@=+ofqdxN3ZYW_Z|ibDO+ zgp|HHSVJ0}q-8fEau;ny7EPI!H8pEm*7U60@HefR!){f(r!hiwj=3R^fS2L_Ro>g~Vx zO%30>=mL??UX5C~zQlwC`g#_JuU`IU-q*3X>=u|a)L1^!QPUL`On_hl3(~hU2sV|^ zX3gZY8Ew61zO#`g`i6G2i!XTam>g%mvo!~S`zTVxAMc>3MMK~GXbF7#yWP>&S2?=c zTQ%Xc&FOM(onSs~wXsB~QD{p}`ASI6V=N~rXlLS0{ekuoUqhP?LZ<+q38}h}`L{m! z`Rabuk3%o{PBJ?iToYV^b~f-Cb{V(<0tOKCc86n z^c+XKm%;8iS{X;O=V)ylZ9GRC;|O?;w#L!ja~xwFX`Z8`HO5dBT2nbv1E6#IECw>l=3Ua?2?xhuM|po>nO$Su9sF{R4=_ z`>!QeQ9W!T=_ucHshu%HxD1c)>QnZ^a=0b~YG%OB5 zn5%*8@CyO#Gea^YRfu$(5+B=W?i(cPMW)n9diFBt<;0eQCm&T-=`@-LYfDe0!b*3g zmF_CoQ#_e!$aMGY^T9a}&IRW@SO6}0un+-kTyUJ!2rhnjele3<)J4y@2%$#wnJqOQjHhmGdA69SmUAbg& z+t~#bj@uu(=)3aJ;E;^>%aZeO&$KV@;J3zuZhWwo*4iwNmF?`Xy zM!wsj)*o@bxA*=#aRIund6n5 zzc}n`TI3sk@jPFDf9n1I{>x4p^N8=M3;jp=`rUFX4OwyB^whqoCm^ z=z5d!Ialsk=vnLkim>ZU5Ub_yvj+X8vMTyyD%O!4p6g5xvQ<o5;NMx|pe^Zns{bn?#5ifU&aWTD?uF|aKEX%&$Sc<8 zBLVDQ7$wx*3ndC)MLdgDa)hG1yI$t*=7@g6MzClD$QYj-r(quUxbEn%MUK zK#D)mWxmtt);WAmp8ulBT+K3n`3*ff@AjxT#yE?e`ccf4C`#~@lr@WWcn0bK5fD#Aida{wJ5iskUq$jR}|7`LUWQd zM8wb~;g7%QDdpyt6&2A3X7qQAJ)(u*$kRZp9FCmtInZM&kpX7I9KH0&N{!WxS+hq!Rg>Y2g2DoZz7yVO!WX!$U*zhCOI1Jb#Zy0#Ovm;l6$gkqE*}+G7n<1C^G}hCd&u6k5 zohz8G-ocSJhn?Yrl{01KdGo3ZovN}bN>N#Ll_?KX0QJh;OD_tjGH-riZeeMG^_`oG zzLY*EdupioD{1(iDK+>xx1zYJFt?mO>*f}fn_pd#n_pH^J=Y#5fKT&9dBr7;sftddW)~J?fBWZp)$n+Qg6g?*7dpA+)SIH3HP=MUOS2c@N^~G{%SsAxVIXJ1BLmE+fCXNr zcoo?UY{0$NDJY|F?BOgoniiSTqiZcPz9M{`G%ye%QuQNMIUGE)0wM54m}|x^AhPoH zU9Jtf8mfxvb324hmYc%lQbBDngc?BiZ-l>)(TsD-^US8pPjHKKQbyjnHFFa)`-T6VpNsOH95ZW>{jI6~2*)f!f$$V)x7AvJ%rSiO)(LP}68s;^uf? zXSYe>0Ag8*-G?OxNS6EzOZ0nNm;5h{Nx_hp^we}2(n2{?XTZt7Jv8P2(}5~f76FtI z{nNd%+~+(qQ1yki!3JF?JSt)5Bi;Gsi&rY#*2j@;AC0}{D$cLArnXdN@iy9L%^ zaOkjbw}j4r*MBRf_xx=UwM7teS?E4 zoqrRFX`S%*7w#6ww-GQHEjyN2wD8k<8gVnm2sV@-!q(yE5rfXY^lzK@&6|Vz^-98* zBf58DxBY*_{!>-KYS|?X_-}6B|L~eemSXK6UCL>>8An=3#2pRH6#{s}%vmT39EHcI`&ize|e^#b4WRTdf54S!6D|A=$I%Hg72YBItHTeUP!`DjH;i>bwEypoY2nJR^0eVGE#?(w z9cizexe=~&2I;MTaWo?tdkl>98&D08G4Be&mGQ30cE(M&?qNo1U|(3bRX#tNMmrqYA5n=6PRE%W)(< zDa`dAw@kO2B0^@qcQDr=u4Nh1Q_CD}1Ku|a-)M1^n(%nOupr;s;wctKn<4Ux8sKX! zjy7N9w^`iQBl}(;T(l7)|3w4x(j7w0q8HdIf^AyKdBbf8OLpVM$%&$~@9>?c8#pT)UcEuO7d!6D# zSkKdnzs&BJ6d%X&c}wvEPS-xg%h~;<;@@z%zbgJHyAxQSzL@pgsd#(Nhes5b z{Mw>;KI?x~@he!*`-)%3T;5VjJa1#vIMX8E@j zzmdcJSn(5>f2laDaoTe@QZ9#Beu(0!?0>Z4XE8rh@%hYWDlYLZRs3v@&?3cUzoSbO z$GB~nTNKamuye2CW;7a|lXc-Gy-%{-RwbXndR|j}4d>4XieJR;gNkoqx9oEx;a)Egim1o0mYx@{Oqatb*$$^#Xs=WI>Qy0>*RFB)8f#N&wVf-DlY54ex|s{|Dd?YZ}ZgE>#y4VWU)h3?5HPV|1F-3lVl`6 zJ(uGI*n(toQVppn$SWwQh>ZUIy|KSE54P`s0L&jB`@5kV2Tq4fW6gAqqtU+yU@wY{ zjm2Qx-5AKbCm8xECsdHKKZhKLvP0kG(3s!D!J5yy2Sac0axMGedD{~F$|317-=HZ~ z3kRK?wDcjOG~RS%`gfa7CaVz+($L$UX~a(la%miFB>hXyb17aUy`i!c^@F>M%vju! z%f73cVkdh{K8+&&AXvKrp=O7k&k22H!W_PBX(|v6aUP6=7m?bP2AKq9hgzltLnEE^ z%?FN0*xp!Q9+;aI+J>N>J$N;9OG{4Za}LiaCAp+!#iSvt$NM8|tB)Mqmej$)NbVog zH`7?|2@^wagkE|A6?S|u^fi^-*kI@%Im_=$SwbjSTa}VYgRW`Zc5JYALdt-g&|9Hi zDI;iXv42D;C#9(u?`4~_DW*xwno(WGC}J~+J2P0DlM)Pu_AVLV1d~Qmb@{+ZQ`s)V zvo8dLrle77={vnK$(h}086cw7-vsk_K7(r`SR0F1xlVA)-nd{7D(?!v7wYnOd%#$wWdllHYapQhHp##$$R2tKpjj6;Ja zswti(QkgaVx%49hjA!$+-CXWm6_KF_FA8lJ3AkAbjopF#I`t9P;|^Sc`_1)Om2xPD z#@`>#3Vn-9Ge9|GS$D1QU z=In^1#|MrGeOHuKb0lU&=!c}GkCPX;ngnat!h6!vJLz|1(&I-6c1XH(6}4KNiZS^| zPFqgxfmJBLj%&=C4a`Q+CikYH^~ssVfG><*eM z5J$CVYRYU}=H)4=?CtiA^zO1q#r4&`5`7N=~`;4A`M1%{;#8I&mT&cW`FWS?aNkBmeRguUwn3tt)pwt@8Z?$ zqMCtJrOfN2V6Ev%1oID@N@8-Bn&Fp%J$}t`|6wWzOQvr&`DTX^%wK{qbd5Ri;xCjY zEB9Cf)#*)$daxEXh1y#xi|o*QM(u%N!!Cj zgXU>WN|7{C=%us>F&5B7vIPIh*g|DNh8jlq!DLN(ulJs zX~fx+G~(<@8gcd{jW~OfMqHgq8gX?dX~fl;q!CwVl15x7w~FGrhhv-KE+Q9C(uk`w zNh7Y#B#pQ_lQiP$Owx#}Gf5+^ue*eF@+6J840k2Dc#=k3ok<#TbtY-V)tRIbS7(w& zT%Ac8adjqX#MPOk5jWPwJ2iSwjK>@&jwflvZA7ZgTZp(PVP*SMNWM2@KQ25;V>q#R z{~8i9(=ibL@FWcsw4rwiZ9%g4kt1;hd8j*IBi{c!ok%imbbJdJJt}fjwMoY~2hZB~ zl(4lQs+6JrV?pWKpr)nqgLpY$qTYC&S#!g)KLi}(MF!jMm?$>${5Q#apY#}2O=|bk z(Wr`Tas}QW8ShP2datCKCpUTVa)RasP?MJ;)>l@C>0j?7tJ4(EfPf~TB&R8Yz!~Fi z?=#z*N7i0`v&p!ioMCV;BBZ7FC)$7f=){~Ip!ZGG$IKD zV`kF9yIv9o8Aq(S)Ds39hc^W)VTf@w_09~9*+xpe`B({=MwvGsD{{SWgXN`rT>-#=p3ucYfr%3{$uWRQK#LT2(-#8a$@d;3Vb|sV(tQL z)3$1ExfAoyU&v0?0m87Fg6QDY!zaa^Q1DjBVO%2 zFOy9?SUP-gS6@f>j$@6t$p{<9bDoXDhdHitKCMt0c6I=Br@&tm^xuuyi^d`VlYbkBNJzq+_{@)M?|cew-?q7xCp1LR9DF$bT5` zta8@YJsWm<8M^|3#9ZlkiM;|9i>B6G7|1KGblj`uZ5%l*mzU~mP(NV;CNm>Wnt5}r zgc-=EfvxU!;`Dr8A5Lz(9|_~)?ASnYzE9VHm$Ht}kTeWCMQtF@aXUc_rjuE)wDW#) z)+@{u_^3y_pomSX%V>I0SJCQ4wwpLR&r*ftp7A7wk+Ohs7X;q*Vsb?mC+!Aio31P9 zycGdDS5GEjW-^^3;o^G#hyqH)RcUI}ujKMBCi6R(8U`{=@5C+2bv?&jwjyL87H7X$o$deVon@E$XZrj4CizGEy5HxUM8AW4 zb2g@(Jo*0neHE#F23~o;@0Z2YHBW>sAySWaX!$*II*q^qwz1YRo=+Ej*P9~6V#7joA{=g za$=S7FEmfBzM`pN4Q#2eXq+f|lto^w~FJwu-r6>yo3pLVs~9njtWA)uXJJrG5O}ZJuEhj z^@b18BKun*N-#A0P^@-{@|93RCb5?}@JMx-9uA!?^6gu`EmLyDdMvg4Fm8D9A} z;_H`i>L!TwhOn>kvVW(H8=%@KpQ7c{Xp{;ny7z>2j}z<7YP;ewKH!!#k$Qx*A5V`(eynG$y? zU(%i#@!{EeDu0x{8!pry4b(n!*r%kPA|;t5-}s}%vn~6Q{4tFJv&;BM^L`~6k*KHL zsw1E?k3y5Y`ys4ps`Tw-d_A?NV(lBQuG7UT;YNx18kT-D>}#S}hw@VjT|isddXRdk zFj20l`idrqqRwGO(?n4cbs{}Q(-yI{Us!j&X6*j|R3t@_#0cdiQ98o01QWZ&jT$3ge$C>aChB5Eunq4g&AyVHm9aw^xvh@Mku{xDv2Vd@=E zdc!+0IC&=H8c37V%x2w2=a3Z7BVH3>(&PYA@;=+sGsv-@9cFQCyrikj%Pq>ATU@e` zPT~cKWQW;By110)dsbA@DZHp67ZOb_yb@xUdD}!UN6aY)uS!G%WFw^D946Tf{9#UBPti5;-~ktMZX4 zrr~*$W-6&S12eCfCkW?K4rSz4OSPa!eazWKSwym^5-$L(WSiOrt>Kx%4NQrR6c)1E zsv4FuugX_h%Zp>KtUdA87WPUfJe`!{5T2Kun_KNwfbdpSGES1Tm zh`yPpYRz7bEGkY9PZ_4>nM!ObZbc={-^LpcnQMxQiA#-Sa~Bm>&;-}WmElcctusBg z(yO49`KXU(?(uKUp+$KivSxy;nc5s>HZFoTxoc)cBYZP)d?qGvBfjPb^RsDAI4)sR z3MObTKV)_-Pj3xBwnHyh1iJw0G*AdFGToPwRbEk6RYvo`?FIuv-duO&o{4Hbg*3&S zmogwF5J8d=17vWdd5FwNpG}2JbHGtVmHB1mg|xQ36AnC_=VnH3y zqBLcesnMqV!lj8?N?X$)=6_%ww--6@BDR~>@XTn5FRp#3u%g0LVX7O*d9;|)Y9oAm zR<@V8hNtIKvY?{Q&59ym)~=^4$j>V+D>d`BO$<#{uqW%2cQ2R14U9FnpDP2k&3|wy z1Gz5##R=Nf-nQg6SI^PLLm$Qzz|j4{m=yX=W4jp(JLZzOn)orbzRP2?6Vq12#9Z4X z(H~53Fdso4GPdCfhURLoh#8gGrq)Muw=a*SIoy}TjZRFfi651?#Puc9)b6wqiQTiT zdELQ;v+BcB5>8ieWTHPS!Mrkjf#Wp|y}U8Cu{DjRC$4cXkGmxPikKC?m~Xw9(YgQa zx#Cr369jMD1KJb;dl}Fc2dUm$CEgr?9RKYz$pe(NC~EEulFc)jeAHb7)GyoM4L)~6 zZS1t+!Po<+(+7h(iEyOj(FTxASNaD>@!KYo{n-q59TvJY(E0EBPba?!UmFSE=k=Gu zr?u<|I-?nchf~KH1|4YIXxX83Ql|;>V+VV_)^Ua-|4>Fc|0WXCI^lD^43hty_>U#o zXyH4jK?}Y$dIsSmY#n|cF@)cj{%td#8>po=B)h~_j^)Hm`Kd_!%>G-d{8M6PSt01s zLajp%gecEn3gTkk#c>6nAVA~&g1aUQ74ttd4Oc2g}*sU_{~XHhyMaG zt&@=RaR>ZH?pvO#zU*^!B3k&nIs7#Ci1MQWO!dNli&(Vqj}FiYGBeC?}h5g$Mb}gGo08BL#&N}vw z_}NCvPZ-uYkCy-b(>;k9EQtJXOaJ0u>L2Pvy=#})8r&Gj$ey~MtA6~W#T~K(`glGj zasK0LZD;z|;iGwp7XHe9p8tywfMt}^I#bsQx&P)l@EEWWPeU~_C0U$sjJ^ODlgSob zu122aq)zl;K7#pXzOUnc;oAE{@Oj+!peL5w{bX{B`Oob$ftIko@r7qB*FEPmEk|7j z*S|6+-;{yrE7J?3~KnLdH6ld3SXJ{R8^i&;BAO&t~2~f{e|3 zUD(9o?nn4+0m}~x6VFo29Q_#Elp049XQU0;?(+uf)Hzd0E_)3EzHFV#iQ9ERJl)m+ zznk@lADR32WCQXqHNbZ^z~63w?`eSVZ-9S69O;#BIOcha*sl%9V=Wp<6N!Wk=7L4z zXg8zrE)DRE2KcB3IOZxM{%g4LG|z7oE6nwd7Vg{zIOaY_lc#ric=k@scg(x6)c$=l zPIT~+4>s?OMQZ=_0Vm?!1uPk68No`j_Rnx==oc&}IYf;`N6mS4TL+>(qreRtYN10lv(ky^Yd~`kDYI~ zHxRD9W{4f`!wu+v+|rL{Z%OYl$Y3(a2Xx(p2Q8jzag0-jfjqiuBL9}f(=7f^i{qJH zlDEt87v?%Xm~#Sy_}lU6%3Oz=$z1Ch*?^uLOOG9&JWJkg zH%gczAMi>*@}bh===%%D_+=Q#2k2k;&6a+Fr2##!HK1oV zbHuZw70-WI`V)zZ`Nq;?$Df-+Q(j$2SklYlX5c#)wNWK?25mN85xv9p7|+2l!cRoR z$RM3C!p~-T-1}e_6yL<|>59ufU?qzG!tQyBKgjVpUvbR+fVt8;gyT7e`E`n) z!TisP%NjBdD2^#%FnG>@k^ICF<^}H%=KI+FhT@NLxO)|sfhu@zfD!#qaJWBvILu`* z65h|ii2MxWqPnMe2X1i5@i(|!WVLzG)7lHpk@t+k z-($W&>FLCJE>Zk$j?XoU_hk2Nier-)n01PKlqTjX-h#uGJrpFK(w}=r$?s!-%#Tw18|DGUk7u{6*&}*daQ+Nd@{8F$Lh<<=@3D$s&*4s0T-K19 zt@xL$XT9Rd;%Xu z&&w>=TJg(RPd~+XFdwS;Qcjn>wi4P~mv0(pDtW2ja}>XT-SZXylJ(2@MTvhr=g-qh zejvMFR2=tU7#Y?ldeS&uvIdXvOwOOrm7Zsr|ERcJC-JOL^x(Y#j11Zn-k#<9DEXgQ z??A<~Sda8?MbC7WAFt$ZW_PaQ`#Apgnn)jz9V=nnG?^|D1{5qC@N9mDr*=KQtJBcgN0gEGCSu^fyi$i_|%OAEl5K5SL|&&=OqF6H$p$Nz}Mk#F){x+yo-kO!AZGi?p=J{=1ce}T>AN!DPGC$!-_9rH)oTn z&tk_Zu_GVE{#)FRKR0<0cLL_u>m%5_pW@7U+#s)Rb%o$4}Skn=<6{_4}KO5P27;}{(`mG_Ct5*Sy~nB z`=7E-dJ}tPpBP+z!3(seS59aztujaQKO3PO-vyfu`XVRvt0BSV)h`%w#5ijX(w^0y zyE(qO8)}CiS+@DY+k>@*yQj#O*e^c!e|>$W`U@k`ET_oANVLziEL}wRZhL{F$TCRO z^%fbt1#V$2QAEy`5hu0UvIwj}eqU97`{UwQzYIEa{v-XXSv-XXS zEJ=jj9RK}&qs`ru7CM+owZZoqsY;?L3{H$$Hp8^Ko|RX@b!Cb&DvxK})#p(~KMD@F z(=m~ z`ibX#d_4#6@Z0bi=Sxx&^9QN+^Pb z$?*=<>zF9krx?-1-E|kTz1~5DY0-gt=NQO9C7O{d*7baf=Fw_j_=E^k;2kJJ({Ezy zh6rL?_#hReG%PYstkq$Z8y07aMEc5+1sy}}`w<{roxDPD2QQTmfoGLmaEML-?x zxjNxlU3KOt*|X;s71CTCnJ5P-Z!(XyIq4sq$OFIOnT9;?RP9Mh8GcT26>S--rV)BG z-pm|3%m$oYJZrYo@bo2n7gIBvE`0UYol#~_PHbT2W7vb4gh&afxAA9TX;lRcE-GH+ zZER`HbP7+?Lc*i&0qV_bqftvU9iGPa`IA7(Jc-Cmx5fy~{Xj$N5k%Us9&T*no0=&(>f(3<|c{?o~C_|_W<#*y%|)Jf%Z zMl|4GzBS^OV;k*%D4o=4f_xfYXpkAp??8}WC?mOZNd8SErgai>{>ksmzJm=mtLCk-%CvEB;k98_RTE)UcW-JA z&Oz@G{?+k^TgM&3t6F$o4zmZ0nL=1Pd=yi(@Kl>fbQuWx|!?Z><;=UbtXKm*FLn=9T;8n@Q(TtJ%T`?G z{z&>HT{0%j9)pN*y%(e2Q!rGCd?(gh!bjm~_hIIFhp@bibvR$~L)>s&skrR>hx-_e z=$CT3-NRun>0GCHIqQE~@mhAjr1&Y^XuhTRB-XP}aVZa}7ZT6CEdQ&LKbPGJd|u=) zV7H7t5T4KR>89jm%%9B75P7MW_I`~h$E6&uy zZ^_}>`!yoHH?lmI3WJgKZtTMYo+G~`Bo=x9e z^W%}Ekt1j$qwr2pBYs0ZxP3G2d~}37(UxT+Qqsg%kuj;VzZi#CFSv%hV}Gta*otd^ zI(;cG!1i1vDTishJbai>|1SMq$&1kQRl`HujVoxf=J~4e!P*6`N0!mvM9)-{{-5dB=bAR#Je*)y0@ma8 z6R$Tc;X7j9UMjRx5**2%SZm|(2G`L}NjMYm&a^d-?w;cq<4E%y?To`4NJl#*!Ovz6 z^*G~tfn6PpYX`dm#_xtGX+7xAt_?x{eKvB?!V!WxL*eMAes6@!pS(2KC7g6#4ne@wBCmG&o)M_HQ z$x|&@hzZ6fLjFZB0D1QFP{;h_%~UNTyRvZ~44yUT8>f|rWgGWLzsrk!n6AF1I(V_KrEGspwDe7~FrT zx5KIE*np}U67{0pQBu*8DnX}+qp#z37MHi*RQ#Q2#9X%>VikXv?TB{9!BcmPvx|hI z4;U&g%`d4gDC|?Yu+lNx;gl55>@zDrzt4gJ8Mzt#dRG({%+9OoT~b_Hy`WFO)PAWM zeb|d9F8*g0)2g=iemWRSVje{D5!1@5JnVQwkqM6>agf};W*6T<1C;!2zWv_c z+TV4^$vJ(-_{#nJs;{ZO)i-=!=a^ote5Hc|nNL>kkBPH}DRo4G$33i<`1nFZWU6b^wE(}iQ zBdvNb)=R@^nndT02x43KAijcOk+Ha6!7TI+l&xdgR_`FbG1h4~pN(jms^!-)c!rNr z3Tz{vdM7M$mRR3q6zfoXEji50am1sgTddo{x+a9h*|LX^GM}4bBvxt3q6}jDlzk=B zWdh?mXNlEof$+g8S|r7zgz?9M3ve*0;o$1k^B#Qa^svZTVjasUdW^)QrCY4>J|{{B zh|cP8aP?v&B4uHb31ZzDMpNHotB)EdFDL6&n$;|FZ`jvZv2G5d@dw!Ya|DUi>o!Jh z9^{pBP1x61vAz&SXV#D8nORIgpR zn1b}qZlGH=I-)dg3^z4zM4*H2rI5K;n;-o;0cL<4dS5okrS1{BNy0El&OvX6K>4`^ z4tft{#lSJM+&B`AYdI2&-bCsQzbq)6Ps0__^QX1jiwnqpiLuWzc04s;r-U-%cv8sC zMMTMQw{euxjU59tA2zPCq9U^6p)InmJ04eP?J~Oi(kVP6 zrV+A!C~HcqD+>!qgEw-KLkP#9YJP4d1p>Dj#pjJ8WGPNict|Kp5t8-Bg_3q!VQntu zQF$J1A_wmXk&5V#uKfbS5d4fOn5 zP8*C+qefYrOVOuY6j;J*4sua_Icw}K70^vDrHvD*p4Z)vBb;5{@K?Tg5S+P=BZGvw zxq^ITJYGXne@tyIDlx_KKQp!#cm4LdD zJr8PQhb4BuJT5CS?UMLY5(m^Y%1+FTDQJ>7fC%k|KoY|e+mMf8iT;rZIf(;?*TXGI z<@v0?Cyt|NdxQK$KlnAw(}fp%{66Ms!e=M?17zRI{1F@{*T!7#yCk+IZbV{QOet-X zFfsuTyZc!N@6j<%xF%+9qMxitV=Uj|O+3sw3J`KI|KnqZy$u!q!y|`jZA&LLzijSY z8mjK3mX=i&rqYQ0-c+^n=kVC%!r8e+6|}mgm(2gSzX4K!Y@{1`9h1o}eOpSdBjv3j zNWF`C<^_JRlHMQ665&Yszzx%t{=w-MS;t^g_h?3k)r*9n^WXK4y2{n4PH+-_sXD2g z4UQE)h9ipZmu$HG3Gyquv9BcWi2Ons>HNdvg4PKiJI(u0`sS=oDyMlOjT(Li zwEVHL!Y2QflEKY9|9W7W4u2MjX$GI-e<$@zZKGu|CPy>KC-K_}^eAnkWh>~Uin5R^Qycy6sq2O8$U&dsB!D!h_iA4*4bCmEglTe5M=O{V}IrpGJCS%%M&uV^k z_^XLV3x79or#$E|cy z?6%w&(!kg-itO9WbaQiv{RfnCNx!JwMV4s!=ReVtSj&P?cQpNre~DgmVk(P_kK|*_ z!THELgnw0ZOxktaA-tfY=SBAW#5*>;vDM)>CKfIHLn)sBo!%k*tHTeUP!`DjH;fg= zr>l7HW0#i#RB|>xn+v34!()iiLew|DIxA>I&ii!Z$fy1%#}MPPw8s#eJ|eMB^lv4d zW8#gyipDWGA{rmw0M90laM!VB(`O_5nGMKe<|gF#&=JP;Dd{+e{=oxW5z}yz4BjF{ zi_cQxke9b;rmsot$_C_DHNbCffZs+O`jh!0H2qX!$k%A`+0X#TD^}={7f_NvFE=0` zdCbCdOlrT3e*MCaZ06zKiN4A^?b}!CcmigV`miVOsU>%Td5Wp?z-2qk`-9w~x>Dv< z&|Gg>cVm~OH4|> z{)@#sSbAD=y+mH3?HB#BjuztI(c)cL-o97SX{R@H$ak{jr&&D3;^?cwpnbKwaMD78 zqd#*o{lnls2qXL<){A(+2p`Dlly63GvZ#?mT403B^Ggp88$FHKj)Of`AMqK&=LYgo z!j*Lr|DVRrFEpnxj^l5OmJ3Rf8m-BN~4p83Z4j*U6s_%y3ub*8VDPlNFWZ8x3UAIIm2^v$M^ z^G%di<9t3(89%S~@Z}2aTq}Or^wouZ>89}k@q89)_8yyxJ*<$&@;z=n(@i1&o;h5zKf05sbB18{M)75VERtg8;ze+eYf#$)gv`d6#TcU z&Tk9gyA;n3)3=M`hyJbjRnwQLe%ts-)gKwZC!ZI_`ND6ymb2X>s#hB)AKOCXjQcB$ zA6K3H#`w=J!d0p_eKwOWFWZfO6yIt5n(8ga<2o`*I`=+4cl`E>{DHLRZm!OreVR|N z>fOelD~>(JXR4j|jn9ytagOcA^EYZ@FHL;HYe@dJ;er;BKI*h*(zi1r&b>rv= RD_ARRAYSIZE(names))) { - static __thread char tmp[16]; - snprintf(tmp, sizeof(tmp), "af-%i", af); - return tmp; - } - - return names[af]; } diff --git a/src/sfutil/kafka/rdkafka.h b/src/sfutil/kafka/rdkafka.h index d584ffd..1affb30 100644 --- a/src/sfutil/kafka/rdkafka.h +++ b/src/sfutil/kafka/rdkafka.h @@ -140,6 +140,16 @@ typedef struct rd_kafka_conf_s { } consumer; + + struct { + int max_outq_msg_cnt; /* Maximum number of messages allowed + * in the output queue. + * If this number is exceeded the + * rd_kafka_produce() call will + * return with -1 and errno + * set to ENOBUFS. */ + } producer; + } rd_kafka_conf_t; @@ -326,9 +336,26 @@ int rd_kafka_offset_store (rd_kafka_t *rk, uint64_t offset); /** * Produce and send a single message to the broker. * + * There are two alternatives for 'payload': + * 1) static data that will not change or go away during the lifetime + * of the rd_kafka_t handle. *This is uncommon*. + * + * 2) malloc():ed data that librdkafka will free when done with it, + * this requires the RD_KAFKA_OP_F_FREE flag to be set in msgflags. + * + * There is currently no way for the application to know when librdkafka is + * done with the payload, so the control of freeing the payload must be left + * to librdkafka as described in alternative 2) above. + * + * + * Returns 0 on success or -1 on error (see errno for details) + * + * errno: + * ENOBUFS - The conf.producer.max_outq_msg_cnt would be exceeded. + * * Locality: application thread */ -void rd_kafka_produce (rd_kafka_t *rk, char *topic, uint32_t partition, +int rd_kafka_produce (rd_kafka_t *rk, char *topic, uint32_t partition, int msgflags, char *payload, size_t len); /** From 72b13213bb33d772ab94d101928720e62b4dd0ee Mon Sep 17 00:00:00 2001 From: root Date: Mon, 20 May 2013 14:18:25 +0000 Subject: [PATCH 030/198] Added to sf_kafka a maximum queue length value modified: sfutil/sf_kafka.c --- src/sfutil/sf_kafka.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/sfutil/sf_kafka.c b/src/sfutil/sf_kafka.c index 098ebd7..9eb60b6 100644 --- a/src/sfutil/sf_kafka.c +++ b/src/sfutil/sf_kafka.c @@ -43,7 +43,7 @@ #define MIN_BUF (1*K_BYTES) #define MIN_FILE (MIN_BUF) - +#define KAFKA_MESSAGES_QUEUE_MAXLEN (25*1024*1024) /*------------------------------------------------------------------- * TextLog_Open/Close: open/close associated log file @@ -56,6 +56,8 @@ rd_kafka_t* KafkaLog_Open (const char* name) if(NULL == kafka_handle){ perror("kafka_new producer"); FatalError("There was impossible to allocate a kafka handle."); + }else{ + kafka_handle->rk_conf.producer.max_outq_msg_cnt = KAFKA_MESSAGES_QUEUE_MAXLEN; } return kafka_handle; } @@ -152,7 +154,9 @@ bool KafkaLog_Flush(KafkaLog* this) // In daemon mode, we must start the handler here if(this->handler==NULL && BcDaemonMode()){ - this->handler = KafkaLog_Open(this->broker); + this->handler = KafkaLog_Open(this->broker); + if(!this->handler) + FatalError("There was not possible to solve %s direction",this->broker); } if(this->handler->rk_state == RD_KAFKA_STATE_DOWN) free(this->buf); From 7f1de117690702db192d2d59ee3d7c997a59cd88 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 20 May 2013 21:17:18 +0000 Subject: [PATCH 031/198] Added json_output plugin --- doc/README.alert_json | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 doc/README.alert_json diff --git a/doc/README.alert_json b/doc/README.alert_json new file mode 100644 index 0000000..d4e4226 --- /dev/null +++ b/doc/README.alert_json @@ -0,0 +1,44 @@ + + 0 Using alert_json barnyard2 plugin +If you want barnyard2 alerts in json format, you just need to add the plugin in barnyard2.conf file, +using the next format: + +output alert_json: filename + +And alert_json plugin will print the barnyard2 output in the correspond file. + + + + + 1 Using alert_json kafka's capabilities +If you want to use kafka in alert_json barnyard2 plugin, you have to put it in barnyard2.conf file. The format +of the argument passed to the plugin is: +output alert_json: kafka://:@ + +Where host, port and topic are the kafka host, port and topic (not zookeepers one). + +Also, you have to configure the project using --enable-kafka flag, and install librdkafka libraries +(see https://github.com/edenhill/librdkafka/ for details). + + + + + 2 Host and network in readable format: +Alert_json can print a human readable string plus the default host string. For example, if you +have the hostname “foo PC†associated with the “192.168.100.3†ip in /etc/hosts file, alert_json will +print “foo PC†plus “192.168.100.3†and the number representation of the ip. In the same way, +alert_json can print the destination or source network of the packet. You have to make an entry +in “/etc/barnyard_networks†indicating this. For example, the entry “192.168.100.0/24 foo +network†will make alert_json print the network name plus the network id. In case alert_json does +not locate the network in the file, it will print “0.0.0.0/0†instead. + + + + 3 GeoIP +Alert_json can locate the region of the IP too. You just have to have libGeoIP installed and compile +the sources with GEO_IP macro defined (it's defined by default). Also, you have to put the database +in “/usr/local/share/GeoIP/GeoIP.dat†+If you want “alert_json†print geo­localization information too, you have to compile barnyard with +geo­ip support: +./configure ­­--enable-geo-ip + From 4d2fbf39fd9cd4ee4eaaafc0559b58bc3d35b7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Wed, 29 May 2013 09:55:18 +0000 Subject: [PATCH 032/198] Added json and geoIP libs conditional compile stuff in configure.in. KafkaLog now have a TextLog to print to a file, and alert_json does not have to worry about send to kafka and to a textfile. --- configure.in | 42 ++++ src/Makefile.am | 7 +- src/output-plugins/spo_alert_json.c | 340 ++++++++++++---------------- src/output-plugins/spo_alert_json.h | 6 +- src/sfutil/sf_kafka.c | 125 +++++++--- src/sfutil/sf_kafka.h | 53 +++-- 6 files changed, 309 insertions(+), 264 deletions(-) diff --git a/configure.in b/configure.in index ca70c7e..883e6ff 100644 --- a/configure.in +++ b/configure.in @@ -130,11 +130,53 @@ AC_ARG_ENABLE(geo-ip, enable_geo_ip="$enableval", enable_geop_ip="no") if test "x$enable_geo_ip" = "xyes"; then AC_MSG_RESULT(yes) + AC_CHECK_HEADERS([librdkafka/rdkafka.h],[], + [ + echo "Error: Librdkafka headers not found." + echo "You can download and install it from https://github.com/edenhill/librdkafka" + echo "Remember you have to use 0.7 branch" + exit 1 + ]) + AC_CHECK_LIB(rdkafka,rd_kafka_new,[], + [ + echo "Error: Librdkafka library not found." + echo "You can download and install it from https://github.com/edenhill/librdkafka" + echo "Remember you have to use 0.7 branch" + exit 1 + ]) CFLAGS="$CFLAGS -DJSON_GEO_IP" + LDFLAGS="$LDFLAGS -lGeoIP" +else + AC_MSG_RESULT(no) +fi + +AC_MSG_CHECKING(for rdkafka libraries) +AC_ARG_ENABLE(kafka, +[ --enable-kafka Enable kafka messagin.], + enable_kafka="$enableval", enable_kafka="no") +if test "x$enable_kafka" = "xyes"; then + AC_CHECK_HEADERS([librdkafka/rdkafka.h],[], + [ + echo "Error: Librdkafka headers not found." + echo "You can download and install it from https://github.com/edenhill/librdkafka" + echo "Remember you have to use 0.7 branch" + exit 1 + ]) + AC_CHECK_LIB(rdkafka,rd_kafka_new,[], + [ + echo "Error: Librdkafka library not found." + echo "You can download and install it from https://github.com/edenhill/librdkafka" + echo "Remember you have to use 0.7 branch" + exit 1 + ]) + CFLAGS="$CFLAGS -DJSON_KAFKA" + LDFLAGS="$LDFLAGS -lrdkafka" + AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi + # AC_PROG_YACC defaults to "yacc" when not found # this check defaults to "none" AC_CHECK_PROGS(YACC,bison yacc,none) diff --git a/src/Makefile.am b/src/Makefile.am index 4a96633..5e0242b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,12 +30,7 @@ util.c util.h barnyard2_LDADD = output-plugins/libspo.a \ input-plugins/libspi.a \ -sfutil/libsfutil.a \ -sfutil/kafka/librdkafka.a \ --lpthread\ --lGeoIP\ --lz -lrt - +sfutil/libsfutil.a SUBDIRS = sfutil output-plugins input-plugins diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 568d4ec..3be0623 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1,7 +1,7 @@ /* -** Copyright (C) 2002-2009 Sourcefire, Inc. -** Copyright (C) 1998-2002 Martin Roesch -** Copyright (C) 2001 Brian Caswell +** Copyright (C) 2013 Eneo Tecnologia S.L. +** Author: Eugenio Perez +** Based on alert_cvs plugin. ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License Version 2 as @@ -23,15 +23,16 @@ /* spo_json * - * Purpose: output plugin for json alerting + * Purpose: output plugin for json alerting * - * Arguments: alert file (eventually) + * Arguments: [alert_file]+kafka://:@ * * Effect: * - * Alerts are written to a file in the snort json alert format + * Alerts are sended to a kafka broker, using the port and topic given, plus to a alert file (if given). * - * Comments: Allows use of json alerts with other output plugin types + * Comments: Allows use of json alerts with other output plugin types. + * See doc/README.alert_json to more details * */ @@ -66,6 +67,7 @@ #include "sfutil/sf_textlog.h" #include "sfutil/sf_kafka.h" +#include "errno.h" #include "signal.h" #include "log_text.h" #include "ipv6_port.h" @@ -151,7 +153,6 @@ typedef struct _IP_str_assoc{ typedef struct _AlertJSONData { - TextLog* log; KafkaLog * kafka; char * jsonargs; char ** args; @@ -164,31 +165,6 @@ typedef struct _AlertJSONData } AlertJSONData; -// ## before ##__VA_ARGS__ will erase the comma if needed. -#define LogOrKafka_Print_M(log,kafka,fmt, ...) \ - do{\ - if(log)\ - TextLog_Print(log, fmt, ##__VA_ARGS__);\ - if(kafka)\ - KafkaLog_Print(kafka, fmt, ##__VA_ARGS__);\ - }while(0) - -static inline bool LogOrKafka_Putc(TextLog * log,KafkaLog * kafka,const char c){ - return (log?TextLog_Putc(log,c):1) && (kafka?KafkaLog_Putc(kafka,c):1); -} - -static inline bool LogOrKafka_Puts(TextLog * log,KafkaLog * kafka,const char *c){ - return (log?TextLog_Puts(log,c):1) && (kafka?KafkaLog_Puts(kafka,c):1); -} - -static inline bool LogOrKafka_Quote(TextLog * log,KafkaLog * kafka,const char * msg){ - return (log?TextLog_Quote(log, msg):1) && (kafka?KafkaLog_Quote(kafka,msg):1); -} - -static inline int LogOrKafka_Flush(TextLog * log,KafkaLog * kafka){ - return (log?TextLog_Flush(log):1) && (kafka?KafkaLog_Flush(kafka):1); -} - /* list of function prototypes for this preprocessor */ static void AlertJSONInit(char *); static AlertJSONData *AlertJSONParseArgs(char *); @@ -436,10 +412,10 @@ static AlertJSONData *AlertJSONParseArgs(char *args) );); char * kafka_str = 0==strncasecmp(filename,KAFKA_PROT,strlen(KAFKA_PROT)) ? filename : NULL; - if(!kafka_str) + if(!kafka_str) /* case: filename+kafka://... */ if((kafka_str = strchr(filename,FILENAME_KAFKA_SEPARATOR))){ *kafka_str = '\0'; // filename now ends here. - kafka_str++; // skip the '+' + kafka_str++; // skip the FILENAME_KAFKA_SEPARATOR } @@ -456,14 +432,9 @@ static AlertJSONData *AlertJSONParseArgs(char *args) * function, will do a fork() and then, in the child process, will call RealAlertJSON, that will not be able to * send kafka data*/ - data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char_pos+1,KAFKA_PARTITION,BcDaemonMode()?0:1); + data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char_pos+0,KAFKA_PARTITION,BcDaemonMode()?0:1,filename); free(kafka_server); } - - - if(strncasecmp(filename,KAFKA_PROT,strlen(KAFKA_PROT))!=0) - data->log = TextLog_Init(filename, LOG_BUFFER, limit); - if ( filename ) free(filename); return data; @@ -479,8 +450,6 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) if(data) { mSplitFree(&data->args, data->numargs); - if (data->log) - TextLog_Term(data->log); if(data->kafka) KafkaLog_Term(data->kafka); free(data->jsonargs); @@ -526,34 +495,31 @@ static void AlertJSON(Packet *p, void *event, uint32_t event_type, void *arg) RealAlertJSON(p, event, event_type, data->args, data->numargs, data); } -static bool inline PrintJSONFieldName(TextLog * log,KafkaLog * kafka,const char *fieldName){ - return LogOrKafka_Quote(log,kafka,fieldName) && LogOrKafka_Puts(log,kafka,FIELD_NAME_VALUE_SEPARATOR); +static bool inline PrintJSONFieldName(KafkaLog * kafka,const char *fieldName){ + return KafkaLog_Quote(kafka,fieldName) && KafkaLog_Puts(kafka,FIELD_NAME_VALUE_SEPARATOR); } -static bool inline LogJSON_int(TextLog *log,KafkaLog * kafka, const char * fieldName,uint64_t fieldValue,char * fmt){ - bool aok = PrintJSONFieldName(log,kafka,fieldName); - if(aok) - aok = (log?TextLog_Print(log,fmt,fieldValue):1) && (kafka?KafkaLog_Print(kafka,fmt,fieldValue):1); - return aok; +static bool inline LogJSON_int(KafkaLog * kafka, const char * fieldName,uint64_t fieldValue,char * fmt){ + return PrintJSONFieldName(kafka,fieldName) && KafkaLog_Print(kafka,fmt,fieldValue); } -static bool inline LogJSON_i64(TextLog *log,KafkaLog * kafka,const char *fieldName,uint64_t fieldValue){ - return LogJSON_int(log,kafka,fieldName,fieldValue,"%"PRIu64); +static bool inline LogJSON_i64(KafkaLog * kafka,const char *fieldName,uint64_t fieldValue){ + return LogJSON_int(kafka,fieldName,fieldValue,"%"PRIu64); } -static bool inline LogJSON_i32(TextLog *log,KafkaLog * kafka,const char *fieldName,uint32_t fieldValue){ - return LogJSON_int(log,kafka,fieldName,fieldValue,"%"PRIu32); +static bool inline LogJSON_i32(KafkaLog * kafka,const char *fieldName,uint32_t fieldValue){ + return LogJSON_int(kafka,fieldName,fieldValue,"%"PRIu32); } -static bool inline LogJSON_i16(TextLog *log,KafkaLog * kafka,const char *fieldName,uint16_t fieldValue){ - return LogJSON_int(log,kafka,fieldName,fieldValue,"%"PRIu16); +static bool inline LogJSON_i16(KafkaLog * kafka,const char *fieldName,uint16_t fieldValue){ + return LogJSON_int(kafka,fieldName,fieldValue,"%"PRIu16); } -static bool inline LogJSON_a(TextLog *log,KafkaLog *kafka,const char *fieldName,const char *fieldValue){ +static bool inline LogJSON_a(KafkaLog *kafka,const char *fieldName,const char *fieldValue){ bool aok = 1; - if(aok) aok = LogOrKafka_Quote(log,kafka,fieldName); - if(aok) aok = LogOrKafka_Puts(log,kafka,FIELD_NAME_VALUE_SEPARATOR); - if(aok) aok = LogOrKafka_Quote(log,kafka,fieldValue); + if(aok) aok = KafkaLog_Quote(kafka,fieldName); + if(aok) aok = KafkaLog_Puts(kafka,FIELD_NAME_VALUE_SEPARATOR); + if(aok) aok = KafkaLog_Quote(kafka,fieldValue); return aok; } @@ -612,14 +578,13 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, char *type; char tcpFlags[9]; - TextLog* log = jsonData->log; KafkaLog * kafka = jsonData->kafka; if(p == NULL) return; DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging JSON Alert data\n");); - LogOrKafka_Putc(log,kafka,'{'); + KafkaLog_Putc(kafka,'{'); for (num = 0; num < numargs; num++) { type = args[num]; @@ -628,19 +593,16 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(!strncasecmp("timestamp", type, 9)) { - // LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR" "); // Commented cause timestamp will be the first forever - //LogTimeStamp(log, p); // CVS log - if(!LogJSON_i64(log,kafka,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000)) + // LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR" "); // Commented cause timestamp will be the first always + if(!LogJSON_i64(kafka,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000)) FatalError("Not enough buffer space to escape msg string\n"); } else if(!strncasecmp("sig_generator ",type,13)) { if(event != NULL) { - //TextLog_Print(log, "%lu", - // (unsigned long) ntohl(((Unified2EventCommon *)event)->generator_id)); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR" "); - if(!LogJSON_i64(log,kafka,JSON_SIG_GENERATOR_NAME,ntohl(((Unified2EventCommon *)event)->generator_id))) + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR" "); + if(!LogJSON_i64(kafka,JSON_SIG_GENERATOR_NAME,ntohl(((Unified2EventCommon *)event)->generator_id))) FatalError("Not enough buffer space to escape msg string\n"); } @@ -649,10 +611,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(event != NULL) { - //TextLog_Print(log, "%lu", - // (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_id)); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - if(!LogJSON_i64(log,kafka,JSON_SIG_ID_NAME,ntohl(((Unified2EventCommon *)event)->signature_id))) + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + if(!LogJSON_i64(kafka,JSON_SIG_ID_NAME,ntohl(((Unified2EventCommon *)event)->signature_id))) FatalError("Not enough buffer space to escape msg string\n"); } } @@ -660,10 +620,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(event != NULL) { - //TextLog_Print(log, "%lu", - // (unsigned long) ntohl(((Unified2EventCommon *)event)->signature_revision)); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - if(!LogJSON_i64(log,kafka,JSON_SIG_REV_NAME,ntohl(((Unified2EventCommon *)event)->signature_revision))) + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + if(!LogJSON_i64(kafka,JSON_SIG_REV_NAME,ntohl(((Unified2EventCommon *)event)->signature_revision))) FatalError("Not enough buffer space to escape msg string\n"); } } @@ -677,9 +635,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if (sn != NULL) { - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); //const int msglen = strlen(sn->msg); - if(!LogJSON_a(log,kafka,JSON_MSG_NAME,sn->msg)) + if(!LogJSON_a(kafka,JSON_MSG_NAME,sn->msg)) { FatalError("Not enough buffer space to escape msg string\n"); } @@ -693,19 +651,16 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, switch (GET_IPH_PROTO(p)) { case IPPROTO_UDP: - //TextLog_Puts(log, "UDP"); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_PROTO_NAME,"UDP"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_PROTO_NAME,"UDP"); break; case IPPROTO_TCP: - //TextLog_Puts(log, "TCP"); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_PROTO_NAME,"TCP"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_PROTO_NAME,"TCP"); break; case IPPROTO_ICMP: - //TextLog_Puts(log, "ICMP"); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_PROTO_NAME,"ICMP"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_PROTO_NAME,"ICMP"); break; } } @@ -714,9 +669,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(p->eh) { - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_ETHSRC_NAME); - LogOrKafka_Print_M(log, kafka, "\"%X:%X:%X:%X:%X:%X\"", p->eh->ether_src[0], + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_ETHSRC_NAME); + KafkaLog_Print(kafka, "\"%X:%X:%X:%X:%X:%X\"", p->eh->ether_src[0], p->eh->ether_src[1], p->eh->ether_src[2], p->eh->ether_src[3], p->eh->ether_src[4], p->eh->ether_src[5]); } @@ -725,9 +680,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(p->eh) { - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_ETHDST_NAME); - LogOrKafka_Print_M(log, kafka, "\"%X:%X:%X:%X:%X:%X\"", p->eh->ether_dst[0], + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_ETHDST_NAME); + KafkaLog_Print(kafka, "\"%X:%X:%X:%X:%X:%X\"", p->eh->ether_dst[0], p->eh->ether_dst[1], p->eh->ether_dst[2], p->eh->ether_dst[3], p->eh->ether_dst[4], p->eh->ether_dst[5]); } @@ -736,34 +691,34 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(p->eh) { - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_ETHTYPE_NAME); - LogOrKafka_Print_M(log, kafka, "%"PRIu16,ntohs(p->eh->ether_type)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_ETHTYPE_NAME); + KafkaLog_Print(kafka, "%"PRIu16,ntohs(p->eh->ether_type)); } } else if(!strncasecmp("udplength", type, 9)) { if(p->udph){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_UDPLENGTH_NAME); - LogOrKafka_Print_M(log, kafka, "%"PRIu16,ntohs(p->udph->uh_len)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_UDPLENGTH_NAME); + KafkaLog_Print(kafka, "%"PRIu16,ntohs(p->udph->uh_len)); } } else if(!strncasecmp("ethlen", type, 6)) { if(p->eh){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_ETHLENGTH_NAME); - LogOrKafka_Print_M(log, kafka, "%"PRIu16,p->pkth->len); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_ETHLENGTH_NAME); + KafkaLog_Print(kafka, "%"PRIu16,p->pkth->len); } } -#ifndef NO_NON_ETHER_DECODER +#if 0 /* Maybe in the future */ else if(!strncasecmp("trheader", type, 8)) { if(p->trh){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_TRHEADER_NAME); - if(log) LogTrHeader(log, p); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_TRHEADER_NAME); + LogTrHeader(kafka, p); } } #endif @@ -776,9 +731,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { case IPPROTO_UDP: case IPPROTO_TCP: - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_SRCPORT_NAME); - LogOrKafka_Print_M(log, kafka, "%d", p->sp); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_SRCPORT_NAME); + KafkaLog_Print(kafka, "%d", p->sp); break; } } @@ -791,9 +746,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { case IPPROTO_UDP: case IPPROTO_TCP: - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_DSTPORT_NAME); - LogOrKafka_Print_M(log, kafka, "%d", p->dp); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_DSTPORT_NAME); + KafkaLog_Print(kafka, "%d", p->dp); break; } } @@ -805,13 +760,13 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, const size_t bufLen = sizeof buf; uint32_t ipv4 = ntohl(GET_SRC_ADDR(p).s_addr); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); /* String version - PrintJSONFieldName(log,kafka,JSON_SRC_NAME); + PrintJSONFieldName(kafka,JSON_SRC_NAME); LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); */ - LogJSON_i32(log,kafka,JSON_SRC_NAME,ipv4); + LogJSON_i32(kafka,JSON_SRC_NAME,ipv4); char * ip_str=NULL,*ip_name=NULL; IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); @@ -821,22 +776,22 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, }else{ ip_name = ip_str = _intoa(ipv4, buf, bufLen); } - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_SRC_STR_NAME,ip_str); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_STR_NAME,ip_str); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_SRC_NAME_NAME,ip_name); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_NAME_NAME,ip_name); // networks IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_SRC_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); #ifdef JSON_GEO_IP - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_SRC_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); #endif } @@ -848,13 +803,13 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, const size_t bufLen = sizeof buf; uint32_t ipv4 = ntohl(GET_DST_ADDR(p).s_addr); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); /* String version PrintJSONFieldName(log,kafka,JSON_SRC_NAME); LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); */ - LogJSON_i32(log,kafka,JSON_DST_NAME,ipv4); + LogJSON_i32(kafka,JSON_DST_NAME,ipv4); char * ip_str=NULL,*ip_name=NULL; IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); @@ -864,22 +819,22 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, }else{ ip_name = ip_str = _intoa(ipv4, buf, bufLen); } - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_DST_STR_NAME,ip_str); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_STR_NAME,ip_str); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_DST_NAME_NAME,ip_name); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_NAME_NAME,ip_name); // networks IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_DST_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); #ifdef JSON_GEO_IP - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(log,kafka,JSON_DST_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); #endif } } @@ -887,144 +842,129 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { if(p->icmph) { - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_ICMPTYPE_NAME); - LogOrKafka_Print_M(log, kafka, "%d",p->icmph->type); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_ICMPTYPE_NAME); + KafkaLog_Print(kafka, "%d",p->icmph->type); } } else if(!strncasecmp("icmpcode",type,8)) { if(p->icmph) { - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_ICMPCODE_NAME); - LogOrKafka_Print_M(log, kafka, "%d",p->icmph->code); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_ICMPCODE_NAME); + KafkaLog_Print(kafka, "%d",p->icmph->code); } } else if(!strncasecmp("icmpid",type,6)) { if(p->icmph){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_ICMPID_NAME); - LogOrKafka_Print_M(log, kafka, "%d",ntohs(p->icmph->s_icmp_id)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_ICMPID_NAME); + KafkaLog_Print(kafka, "%d",ntohs(p->icmph->s_icmp_id)); } } else if(!strncasecmp("icmpseq",type,7)) { if(p->icmph){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); /* Doesn't work because "%d" arbitrary - PrintJSONFieldName(log,kafka,JSON_ICMPSEQ_NAME); - LogOrKafka_Print_M(log, kafka, "%d",ntohs(p->icmph->s_icmp_seq)); + PrintJSONFieldName(kafka,JSON_ICMPSEQ_NAME); + KafkaLog_Print(kafka, "%d",ntohs(p->icmph->s_icmp_seq)); */ - LogJSON_i16(log,kafka,JSON_ICMPSEQ_NAME,ntohs(p->icmph->s_icmp_seq)); + LogJSON_i16(kafka,JSON_ICMPSEQ_NAME,ntohs(p->icmph->s_icmp_seq)); } } else if(!strncasecmp("ttl",type,3)) { if(IPH_IS_VALID(p)){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_TTL_NAME); - LogOrKafka_Print_M(log, kafka, "%d",GET_IPH_TTL(p)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_TTL_NAME); + KafkaLog_Print(kafka, "%d",GET_IPH_TTL(p)); } } else if(!strncasecmp("tos",type,3)) { if(IPH_IS_VALID(p)){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_TOS_NAME); - LogOrKafka_Print_M(log, kafka, "%d",GET_IPH_TOS(p)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_TOS_NAME); + KafkaLog_Print(kafka, "%d",GET_IPH_TOS(p)); } } else if(!strncasecmp("id",type,2)) { if(IPH_IS_VALID(p)){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - /* - PrintJSONFieldName(log,kafka,JSON_ID_NAME); - if(log) - TextLog_Print(log, "%u", IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); - if(kafka) - KafkaLog_Print(kafka,"%u", IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); - */ - LogJSON_i16(log,kafka,JSON_ID_NAME,IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_i16(kafka,JSON_ID_NAME,IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); } } else if(!strncasecmp("iplen",type,5)) { if(IPH_IS_VALID(p)){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_IPLEN_NAME); - LogOrKafka_Print_M(log, kafka, "%d",GET_IPH_LEN(p) << 2); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_IPLEN_NAME); + KafkaLog_Print(kafka, "%d",GET_IPH_LEN(p) << 2); } } else if(!strncasecmp("dgmlen",type,6)) { if(IPH_IS_VALID(p)){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_DGMLEN_NAME); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_DGMLEN_NAME); // XXX might cause a bug when IPv6 is printed? - LogOrKafka_Print_M(log, kafka, "%d",ntohs(GET_IPH_LEN(p))); + KafkaLog_Print(kafka, "%d",ntohs(GET_IPH_LEN(p))); } } else if(!strncasecmp("tcpseq",type,6)) { if(p->tcph){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - // PrintJSONFieldName(log,kafka,JSON_TCPSEQ_NAME); // hex format - // LogOrKafka_Print_M(log, kafka, "lX%0x",(u_long) ntohl(p->tcph->th_ack)); // hex format - LogJSON_i32(log,kafka,JSON_TCPSEQ_NAME,ntohl(p->tcph->th_seq)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + // PrintJSONFieldName(kafka,JSON_TCPSEQ_NAME); // hex format + // KafkaLog_Print(kafka, "lX%0x",(u_long) ntohl(p->tcph->th_ack)); // hex format + LogJSON_i32(kafka,JSON_TCPSEQ_NAME,ntohl(p->tcph->th_seq)); } } else if(!strncasecmp("tcpack",type,6)) { if(p->tcph){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - // PrintJSONFieldName(log,kafka,JSON_TCPACK_NAME); - // LogOrKafka_Print_M(log, kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); - LogJSON_i32(log,kafka,JSON_TCPACK_NAME,ntohl(p->tcph->th_ack)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + // PrintJSONFieldName(kafka,JSON_TCPACK_NAME); + // KafkaLog_Print(kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); + LogJSON_i32(kafka,JSON_TCPACK_NAME,ntohl(p->tcph->th_ack)); } } else if(!strncasecmp("tcplen",type,6)) { if(p->tcph){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(log,kafka,JSON_TCPLEN_NAME); - LogOrKafka_Print_M(log, kafka, "%d",TCP_OFFSET(p->tcph) << 2); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_TCPLEN_NAME); + KafkaLog_Print(kafka, "%d",TCP_OFFSET(p->tcph) << 2); } } else if(!strncasecmp("tcpwindow",type,9)) { if(p->tcph){ - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); - //PrintJSONFieldName(log,kafka,JSON_TCPWINDOW_NAME); // hex format - //LogOrKafka_Print_M(log, kafka, "0x%X",ntohs(p->tcph->th_win)); // hex format - LogJSON_i16(log,kafka,JSON_TCPWINDOW_NAME,ntohs(p->tcph->th_win)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + //PrintJSONFieldName(kafka,JSON_TCPWINDOW_NAME); // hex format + //KafkaLog_Print(kafka, "0x%X",ntohs(p->tcph->th_win)); // hex format + LogJSON_i16(kafka,JSON_TCPWINDOW_NAME,ntohs(p->tcph->th_win)); } } else if(!strncasecmp("tcpflags",type,8)) { if(p->tcph) { - LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); CreateTCPFlagString(p, tcpFlags); - PrintJSONFieldName(log,kafka,JSON_TCPFLAGS_NAME); - LogOrKafka_Quote(log, kafka, tcpFlags); + PrintJSONFieldName(kafka,JSON_TCPFLAGS_NAME); + KafkaLog_Quote(kafka, tcpFlags); } } } - if(log){ - TextLog_Putc(log,'}'); - TextLog_NewLine(log); - TextLog_Flush(log); - } - if(kafka){ - KafkaLog_Putc(kafka,'}'); - //KafkaLog_NewLine(kafka); // Newline not needed. - KafkaLog_Flush(kafka); - } + KafkaLog_Putc(kafka,'}'); + KafkaLog_Flush(kafka); } diff --git a/src/output-plugins/spo_alert_json.h b/src/output-plugins/spo_alert_json.h index 6fb9cef..ed0a852 100644 --- a/src/output-plugins/spo_alert_json.h +++ b/src/output-plugins/spo_alert_json.h @@ -1,7 +1,7 @@ /* -** Copyright (C) 2002-2009 Sourcefire, Inc. -** Copyright (C) 1998-2002 Martin Roesch -** Copyright (C) 2001 Brian Caswell +** Copyright (C) 2013 Eneo Tecnologia S.L. +** Author: Eugenio Perez +** Based on alert_cvs plugin. ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License Version 2 as diff --git a/src/sfutil/sf_kafka.c b/src/sfutil/sf_kafka.c index 9eb60b6..f8b6352 100644 --- a/src/sfutil/sf_kafka.c +++ b/src/sfutil/sf_kafka.c @@ -1,6 +1,8 @@ /**************************************************************************** * - * Copyright (C) 2003-2009 Sourcefire, Inc. + * Copyright (C) 2013 Eneo Tecnologia S.L. + * Author: Eugenio Perez + * Based on sf_text source. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License Version 2 as @@ -21,10 +23,15 @@ /** * @file sf_kafka.c - * @author Russ Combs + * @author Eugenio Perez + * based on the Russ Combs's sf_kafka.c * @date * * @brief implements buffered text stream for logging + * + * Api for buffered logging and send to an Apache Kafka + * Server. This allows unify the way to write json in a file and sending to + * kafka using TextLog_sf. */ #include @@ -49,6 +56,7 @@ * TextLog_Open/Close: open/close associated log file *------------------------------------------------------------------- */ +#ifdef JSON_KAFKA rd_kafka_t* KafkaLog_Open (const char* name) { if ( !name ) return NULL; @@ -79,41 +87,41 @@ static void KafkaLog_Close (rd_kafka_t* handle) /* Destroy the handle */ rd_kafka_destroy(handle); } - -/* -static size_t KafkaLog_Size (rd_kafka_t* file) -{ - - struct stat sbuf; - int fd = fileno(file); - int err = fstat(fd, &sbuf); - return err ? 0 : sbuf.st_size; -} -*/ +#endif /*------------------------------------------------------------------- * KafkaLog_Init: constructor * If open=1, will create kafka handler. If not, KafkaLog->handler returned from this function - * will be null + * will be null. + * This is useful for the rd_kafka_new work way, cause it throws a new thread + * to queue messages. If we are in daemon mode, the thread will be created before the fork(), + * and we cannot communicate the message to the queue again. *------------------------------------------------------------------- */ KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int maxBuf, const char * topic, const int partition, bool open + const char* broker, unsigned int maxBuf, const char * topic, const int partition, bool open, + const char*filename ) { KafkaLog* this; this = (KafkaLog*)malloc(sizeof(KafkaLog)); - this->buf = malloc(sizeof(char)*maxBuf); + #ifdef JSON_KAFKA + if(this) + this->buf = malloc(sizeof(char)*maxBuf); - if ( !this || !this->buf) - { - FatalError("Unable to allocate a KafkaLog(%u)!\n", maxBuf); + if ( !this->buf) + { + FatalError("Unable to allocate a buffer for KafkaLog(%u)!\n", maxBuf); + } + }else{ + FatalError("Unable to allocate KafkaLog!\n"); } this->broker = broker ? SnortStrdup(broker) : NULL; this->topic = topic ? SnortStrdup(topic) : NULL; this->handler = open ? KafkaLog_Open(this->broker):NULL; this->maxBuf = maxBuf; + #endif KafkaLog_Reset(this); return this; @@ -128,28 +136,25 @@ void KafkaLog_Term (KafkaLog* this) if ( !this ) return; KafkaLog_Flush(this); + #ifdef JSON_KAFKA KafkaLog_Close(this->handler); + free(this->buf); if ( this->broker ) free(this->broker); + #endif + + if(this->textLog) TextLog_Term(this->textLog); free(this); } -/*------------------------------------------------------------------- - * KafkaLog_Flush: start writing to new file - * but don't roll over stdout or any sooner - * than resolution of filename discriminator - *------------------------------------------------------------------- - */ - - /*------------------------------------------------------------------- - * KafkaLog_Flush: write buffered stream to file + * KafkaLog_Flush: send buffered stream to a kafka server *------------------------------------------------------------------- */ bool KafkaLog_Flush(KafkaLog* this) { - + #if JSON_KAFKA if ( !this->pos ) return FALSE; // In daemon mode, we must start the handler here @@ -158,12 +163,17 @@ bool KafkaLog_Flush(KafkaLog* this) if(!this->handler) FatalError("There was not possible to solve %s direction",this->broker); } + + /* This if prevent the memory overflow if the server is down */ if(this->handler->rk_state == RD_KAFKA_STATE_DOWN) free(this->buf); else rd_kafka_produce(this->handler, this->topic, 0, RD_KAFKA_OP_F_FREE, this->buf, this->pos); this->buf = malloc(sizeof(char)*this->maxBuf); + #endif + if(this->textLog) TextLog_Flush(this->textLog); + KafkaLog_Reset(this); return TRUE; } @@ -174,13 +184,16 @@ bool KafkaLog_Flush(KafkaLog* this) */ bool KafkaLog_Putc (KafkaLog* this, char c) { + #ifdef JSON_KAFKA if ( KafkaLog_Avail(this) < 1 ) { KafkaLog_Flush(this); } this->buf[this->pos++] = c; this->buf[this->pos] = '\0'; + #endif // JSON_KAFKA + if(this->textLog) TextLog_Putc(this->textLog,c); return TRUE; } @@ -190,6 +203,7 @@ bool KafkaLog_Putc (KafkaLog* this, char c) */ bool KafkaLog_Write (KafkaLog* this, const char* str, int len) { + #ifdef JSON_KAFKA int avail = KafkaLog_Avail(this); if ( len >= avail ) @@ -210,6 +224,9 @@ bool KafkaLog_Write (KafkaLog* this, const char* str, int len) return FALSE; } this->pos += len; + + #endif // JSON_KAFKA + if(this->textLog) TextLog_Write(this->textLog,str,len); return TRUE; } @@ -222,31 +239,61 @@ bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) int avail = KafkaLog_Avail(this); int len; va_list ap; + #ifdef JSON_KAFKA + int currentLenght = this->maxBuf; + #endif va_start(ap, fmt); + #ifdef JSON_KAFKA len = vsnprintf(this->buf+this->pos, avail, fmt, ap); + #endif + if(this->textLog) + vsnprintf(this->textLog->buf+this->textLog->pos, avail, fmt, ap); va_end(ap); + #ifdef JSON_KAFKA + while(len >= avail){ + // Send a half json message to Kafka has no sense, so we will try to + // increase the buffer's lenght to allocate the full message. + // TextLog's print will be not changed, just inlined here. + currentLenght*=2; + this->buf = realloc(this->buf,currentLenght); + if(!this->buf) + FatalError("It was not possible to allocate a buffer"); + va_start(ap, fmt); + len = vsnprintf(this->buf+this->pos, avail, fmt, ap); + va_end(ap); + } + #endif + + + // TextLog's TextLog_Print if ( len >= avail ) { - KafkaLog_Flush(this); + if(this->textLog) TextLog_Flush(this->textLog); avail = KafkaLog_Avail(this); va_start(ap, fmt); - len = vsnprintf(this->buf+this->pos, avail, fmt, ap); + if(this->textLog) + len = vsnprintf(this->textLog->buf+this->textLog->pos, avail, fmt, ap); va_end(ap); } if ( len >= avail ) { - this->pos = this->maxBuf - 1; - this->buf[this->pos] = '\0'; - return FALSE; + if(this->textLog){ + this->textLog->pos = this->textLog->maxBuf - 1; + this->textLog->buf[this->textLog->pos] = '\0'; + } + // NOPE! return FALSE; } else if ( len < 0 ) { - return FALSE; + // NOPE! return FALSE; } + #ifdef JSON_KAFKA this->pos += len; + #endif + if(this->textLog) this->textLog->pos += len; return TRUE; } @@ -258,11 +305,14 @@ bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) */ bool KafkaLog_Quote (KafkaLog* this, const char* qs) { + #ifdef JSON_KAFKA int pos = this->pos; if ( KafkaLog_Avail(this) < 3 ) { - KafkaLog_Flush(this); + this->buf = realloc(this->buf,KafkaLog_Avail(this)+3); + if(!this->buf) + FatalError("Could not allocate memory for KafkaLog"); } this->buf[pos++] = '"'; @@ -278,6 +328,9 @@ bool KafkaLog_Quote (KafkaLog* this, const char* qs) this->buf[pos++] = '"'; this->pos = pos; + #endif + + if(this->textLog) TextLog_Quote(this->textLog,qs); return TRUE; } diff --git a/src/sfutil/sf_kafka.h b/src/sfutil/sf_kafka.h index 46463f8..dc47dab 100644 --- a/src/sfutil/sf_kafka.h +++ b/src/sfutil/sf_kafka.h @@ -1,6 +1,8 @@ /**************************************************************************** * - * Copyright (C) 2003-2009 Sourcefire, Inc. + * Copyright (C) 2013 Eneo Tecnologia S.L. + * Author: Eugenio Perez + * Based on sf_text source. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License Version 2 as @@ -21,20 +23,15 @@ /** * @file sf_kafka.h - * @author Russ Combs - * @date Fri Jun 27 10:34:37 2003 + * @author Eugenio Pérez + * @date Wed May 29 2013 * * @brief declares buffered text stream for logging + * Based on sf_text source. * - * Declares a TextLog_*() api for buffered logging. This allows - * relatively painless transition from fprintf(), fwrite(), etc. - * to a buffer that is formatted in memory and written with one - * fwrite(). - * - * Additionally, the file is capped at a maximum size. Beyond - * that, the file is closed, renamed, and reopened. The current - * file always has the same name. Old files are renamed to that - * name plus a timestamp. + * Declares a KafkaLog_*() api for buffered logging and send to an Apache Kafka + * Server. This allows unify the way to write json in a file and sending to + * kafka using TextLog_sf. */ #ifndef _SF_KAFKA_LOG_H @@ -45,7 +42,10 @@ #include #include "debug.h" /* for INLINE */ +#include "sf_textlog.h" +#ifdef JSON_KAFKA #include "kafka/rdkafka.h" +#endif #include @@ -73,6 +73,7 @@ typedef int bool; */ typedef struct _KafkaLog { +#ifdef JSON_KAFKA /* private: */ /* broker attributes: */ rd_kafka_t * handler; @@ -84,12 +85,14 @@ typedef struct _KafkaLog /* buffer attributes: */ unsigned int pos; unsigned int maxBuf; - char auxbuf[KAFKA_AUXBUF_SIZE]; char * buf; +#endif +/* TextLog helper. Useful for loggind and just send data to a json file */ + TextLog * textLog; } KafkaLog; KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int maxBuf, const char * topic, const int partition, bool open + const char* broker, unsigned int maxBuf, const char * topic, const int partition, bool open, const char *filename ); void KafkaLog_Term (KafkaLog* this); @@ -106,18 +109,30 @@ bool KafkaLog_Flush(KafkaLog*); */ static INLINE int KafkaLog_Tell (KafkaLog* this) { - return this->pos; + #ifndef JSON_KAFKA + return this->textLog?this->textLog->pos:0; + #else + return this->pos; + #endif } static INLINE int KafkaLog_Avail (KafkaLog* this) { - return this->maxBuf - this->pos - 1; + #ifndef JSON_KAFKA + return this->textLog?TextLog_Avail(this->textLog):0; + #else + return this->maxBuf - this->pos - 1; + #endif } static INLINE void KafkaLog_Reset (KafkaLog* this) - { - this->pos = 0; - this->buf[this->pos] = '\0'; + { + if(this->textLog) + TextLog_Reset(this->textLog); + #ifdef JSON_KAFKA + this->pos = 0; + this->buf[this->pos] = '\0'; + #endif } static INLINE bool KafkaLog_NewLine (KafkaLog* this) From 563bc8931762de8f4227843637c3581a5d6519b4 Mon Sep 17 00:00:00 2001 From: firnsy Date: Fri, 24 May 2013 11:32:52 +1000 Subject: [PATCH 033/198] fix: possible double free's on cleanup when HUP recieved. --- src/barnyard2.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/barnyard2.c b/src/barnyard2.c index c9c1a7e..d6f41e9 100644 --- a/src/barnyard2.c +++ b/src/barnyard2.c @@ -1097,7 +1097,7 @@ static void Barnyard2Cleanup(int exit_val,int exit_needed) if (BcContinuousMode() || BcBatchMode()) { /* Do some post processing on any incomplete Plugin Data */ - idxPlugin = plugin_shutdown_funcs; + idxPlugin = plugin_clean_exit_funcs; while(idxPlugin) { idxPluginNext = idxPlugin->next; @@ -1105,7 +1105,11 @@ static void Barnyard2Cleanup(int exit_val,int exit_needed) free(idxPlugin); idxPlugin = idxPluginNext; } - plugin_shutdown_funcs = NULL; + plugin_clean_exit_funcs = NULL; + } + + + /* Right now we will just free them if they are initialized since @@ -1119,7 +1123,17 @@ static void Barnyard2Cleanup(int exit_val,int exit_needed) idxPlugin = idxPluginNext; } plugin_restart_funcs = NULL; - } + + + idxPlugin = plugin_shutdown_funcs; + while(idxPlugin) + { + idxPluginNext = idxPlugin->next; + free(idxPlugin); + idxPlugin = idxPluginNext; + } + plugin_shutdown_funcs = NULL; + if (!exit_val) { @@ -1711,10 +1725,10 @@ static Barnyard2Config * MergeBarnyard2Confs(Barnyard2Config *cmd_line, Barnyard if(cmd_line->ssHead) { - config_file->ssHead = cmd_line->ssHead; - cmd_line->ssHead = NULL; + config_file->ssHead = cmd_line->ssHead; + cmd_line->ssHead = NULL; } - + if( (cmd_line->sid_msg_file) && (config_file->sid_msg_file)) { From 04599022bc4a26c8dd608940a47e328904a48f31 Mon Sep 17 00:00:00 2001 From: eugenio Date: Sat, 1 Jun 2013 17:29:54 +0000 Subject: [PATCH 034/198] FIX: sf_kafka did not compile if --enable-kafka were passed to compile script --- src/sfutil/sf_kafka.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sfutil/sf_kafka.c b/src/sfutil/sf_kafka.c index f8b6352..49427ce 100644 --- a/src/sfutil/sf_kafka.c +++ b/src/sfutil/sf_kafka.c @@ -106,7 +106,7 @@ KafkaLog* KafkaLog_Init ( this = (KafkaLog*)malloc(sizeof(KafkaLog)); #ifdef JSON_KAFKA - if(this) + if(this){ this->buf = malloc(sizeof(char)*maxBuf); if ( !this->buf) From ee5eca8e77747294436b2598f09ad6c26d977011 Mon Sep 17 00:00:00 2001 From: eugenio Date: Sat, 1 Jun 2013 18:56:39 +0000 Subject: [PATCH 035/198] Added priority and classification fields to alert_json plugin. Some fields will be always printed, too --- src/output-plugins/spo_alert_json.c | 207 ++++++++++++++++------------ 1 file changed, 120 insertions(+), 87 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 3be0623..9053248 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,7 +77,7 @@ #endif // JSON_GEO_IP -#define DEFAULT_JSON "timestamp,sig_generator,sig_id,sig_rev,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sig_generator,sig_id,sig_rev,priority,classification,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_LIMIT (128*M_BYTES) @@ -96,6 +96,10 @@ #define JSON_SIG_GENERATOR_NAME "sig_generator" #define JSON_SIG_ID_NAME "sig_id" #define JSON_SIG_REV_NAME "rev" +#define JSON_PRIORITY_NAME "priority" +#define DEFAULT_PRIORITY 0 +#define JSON_CLASSIFICATION_NAME "classification" +#define DEFAULT_CLASSIFICATION 0 #define JSON_MSG_NAME "msg" #define JSON_PROTO_NAME "proto" #define JSON_ETHSRC_NAME "ethsrc" @@ -432,7 +436,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) * function, will do a fork() and then, in the child process, will call RealAlertJSON, that will not be able to * send kafka data*/ - data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char_pos+0,KAFKA_PARTITION,BcDaemonMode()?0:1,filename); + data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char_pos+1,KAFKA_PARTITION,BcDaemonMode()?0:1,filename); free(kafka_server); } if ( filename ) free(filename); @@ -625,6 +629,28 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, FatalError("Not enough buffer space to escape msg string\n"); } } + else if(!strncasecmp("priority",type,sizeof "priority")){ + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + if(event != NULL) + { + if(!LogJSON_i32(kafka,JSON_PRIORITY_NAME, ntohl(((Unified2EventCommon *)event)->priority_id))) + FatalError("Not enough buffer space to escape msg string\n"); + }else{ /* Always log something */ + if(!LogJSON_i32(kafka,JSON_PRIORITY_NAME, DEFAULT_PRIORITY)) + FatalError("Not enough buffer space to escape msg string\n"); + } + } + else if(!strncasecmp("classification",type,sizeof "classification")){ + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + if(event != NULL) + { + if(!LogJSON_i32(kafka,JSON_CLASSIFICATION_NAME, ntohl(((Unified2EventCommon *)event)->classification_id))) + FatalError("Not enough buffer space to escape msg string\n"); + }else{ /* Always log something */ + if(!LogJSON_i32(kafka,JSON_PRIORITY_NAME, DEFAULT_CLASSIFICATION)) + FatalError("Not enough buffer space to escape msg string\n"); + } + } else if(!strncasecmp("msg", type, 3)) { if ( event != NULL ) @@ -646,23 +672,27 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, } else if(!strncasecmp("proto", type, 5)) { + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); if(IPH_IS_VALID(p)) { + switch (GET_IPH_PROTO(p)) { case IPPROTO_UDP: - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(kafka,JSON_PROTO_NAME,"UDP"); break; case IPPROTO_TCP: - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(kafka,JSON_PROTO_NAME,"TCP"); break; case IPPROTO_ICMP: - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(kafka,JSON_PROTO_NAME,"ICMP"); break; + default: /* Always log something */ + LogJSON_a(kafka,JSON_PROTO_NAME,"-"); + break; } + }else{ /* Always log something */ + LogJSON_a(kafka,JSON_PROTO_NAME,"-"); } } else if(!strncasecmp("ethsrc", type, 6)) @@ -725,118 +755,121 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, else if(!strncasecmp("srcport", type, 7)) { + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); if(IPH_IS_VALID(p)) { switch(GET_IPH_PROTO(p)) { case IPPROTO_UDP: case IPPROTO_TCP: - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(kafka,JSON_SRCPORT_NAME); - KafkaLog_Print(kafka, "%d", p->sp); + LogJSON_i16(kafka,JSON_SRCPORT_NAME,p->sp); + break; + default: /* Always log something */ + LogJSON_i16(kafka,JSON_SRCPORT_NAME,0); break; } + }else{ /* Always Log something */ + LogJSON_i16(kafka,JSON_SRCPORT_NAME,0); } } else if(!strncasecmp("dstport", type, 7)) { + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); if(IPH_IS_VALID(p)) { switch(GET_IPH_PROTO(p)) { case IPPROTO_UDP: case IPPROTO_TCP: - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(kafka,JSON_DSTPORT_NAME); - KafkaLog_Print(kafka, "%d", p->dp); + LogJSON_i16(kafka,JSON_DSTPORT_NAME,p->dp); + break; + default: + LogJSON_i16(kafka,JSON_DSTPORT_NAME,0); break; } + }else{ /* Always Log something */ + LogJSON_i16(kafka,JSON_DSTPORT_NAME,0); } } else if(!strncasecmp("src", type, 3)) // TODO merge with "dst" field - { - if(IPH_IS_VALID(p)){ - static char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; - const size_t bufLen = sizeof buf; - uint32_t ipv4 = ntohl(GET_SRC_ADDR(p).s_addr); - - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - /* - String version - PrintJSONFieldName(kafka,JSON_SRC_NAME); - LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); - */ - LogJSON_i32(kafka,JSON_SRC_NAME,ipv4); - - char * ip_str=NULL,*ip_name=NULL; - IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); - if(ip_str_node){ - ip_str = ip_str_node->ipv4_str; - ip_name = ip_str_node->str; - }else{ - ip_name = ip_str = _intoa(ipv4, buf, bufLen); - } - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_STR_NAME,ip_str); + { + static char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; + const size_t bufLen = sizeof buf; + uint32_t ipv4 = IPH_IS_VALID(p) ? ntohl(GET_SRC_ADDR(p).s_addr) : 0; + + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + /* + String version + PrintJSONFieldName(kafka,JSON_SRC_NAME); + LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); + */ + LogJSON_i32(kafka,JSON_SRC_NAME,ipv4); + + char * ip_str=NULL,*ip_name=NULL; + IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); + if(ip_str_node){ + ip_str = ip_str_node->ipv4_str; + ip_name = ip_str_node->str; + }else{ + ip_name = ip_str = _intoa(ipv4, buf, bufLen); + } + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_STR_NAME,ip_str); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_NAME_NAME,ip_name); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_NAME_NAME,ip_name); - // networks - IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); + // networks + IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); - #ifdef JSON_GEO_IP - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); - #endif - - } + #ifdef JSON_GEO_IP + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); + #endif } else if(!strncasecmp("dst", type, 3)) { - if(IPH_IS_VALID(p)){ - static char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; - const size_t bufLen = sizeof buf; - uint32_t ipv4 = ntohl(GET_DST_ADDR(p).s_addr); - - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - /* - String version - PrintJSONFieldName(log,kafka,JSON_SRC_NAME); - LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); - */ - LogJSON_i32(kafka,JSON_DST_NAME,ipv4); - - char * ip_str=NULL,*ip_name=NULL; - IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); - if(ip_str_node){ - ip_str = ip_str_node->ipv4_str; - ip_name = ip_str_node->str; - }else{ - ip_name = ip_str = _intoa(ipv4, buf, bufLen); - } - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_STR_NAME,ip_str); - - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_NAME_NAME,ip_name); - - // networks - IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); - - #ifdef JSON_GEO_IP - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); - #endif + static char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; + const size_t bufLen = sizeof buf; + uint32_t ipv4 = IPH_IS_VALID(p) ? ntohl(GET_DST_ADDR(p).s_addr) : 0; + + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + /* + String version + PrintJSONFieldName(log,kafka,JSON_SRC_NAME); + LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); + */ + LogJSON_i32(kafka,JSON_DST_NAME,ipv4); + + char * ip_str=NULL,*ip_name=NULL; + IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); + if(ip_str_node){ + ip_str = ip_str_node->ipv4_str; + ip_name = ip_str_node->str; + }else{ + ip_name = ip_str = _intoa(ipv4, buf, bufLen); } + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_STR_NAME,ip_str); + + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_NAME_NAME,ip_name); + + // networks + IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); + + #ifdef JSON_GEO_IP + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); + #endif } else if(!strncasecmp("icmptype",type,8)) { From f4cb1c3fde853057c3f6088b9bdb910a23501528 Mon Sep 17 00:00:00 2001 From: eugenio Date: Mon, 3 Jun 2013 09:57:51 +0000 Subject: [PATCH 036/198] Added sensor_id capability --- src/output-plugins/spo_alert_json.c | 49 ++++++++++++++++------------- src/sfutil/sf_kafka.c | 1 + 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 9053248..1c32522 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,7 +77,7 @@ #endif // JSON_GEO_IP -#define DEFAULT_JSON "timestamp,sig_generator,sig_id,sig_rev,priority,classification,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sensor_id,sig_generator,sig_id,sig_rev,priority,classification,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_LIMIT (128*M_BYTES) @@ -93,6 +93,9 @@ #define JSON_FIELDS_SEPARATOR ", " #define JSON_TIMESTAMP_NAME "event_timestamp" +#define JSON_SENSOR_ID_SNORT_NAME "sensor_id_snort" +#define JSON_SENSOR_ID_NAME "sensor_id" +#define SENSOR_NOT_FOUND_NUMBER 0 #define JSON_SIG_GENERATOR_NAME "sig_generator" #define JSON_SIG_ID_NAME "sig_id" #define JSON_SIG_REV_NAME "rev" @@ -163,6 +166,7 @@ typedef struct _AlertJSONData int numargs; AlertJSONConfig *config; IP_str_assoc * hosts, *nets; + uint64_t sensor_id; #ifdef JSON_GEO_IP GeoIP *gi; #endif @@ -344,7 +348,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) for (i = 0; i < num_toks; i++) { const char* tok = toks[i]; - char *end; switch (i) { @@ -357,7 +360,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) break; case 1: - if ( !strcasecmp("default", tok) ) + if ( !strncasecmp("default", tok,sizeof "default") ) { data->jsonargs = strdup(DEFAULT_JSON); } @@ -368,20 +371,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) break; case 2: - limit = strtol(tok, &end, 10); - - if ( tok == end ) - FatalError("alert_json error in %s(%i): %s\n", - file_name, file_line, tok); - - if ( end && toupper(*end) == 'G' ) - limit <<= 30; /* GB */ - - else if ( end && toupper(*end) == 'M' ) - limit <<= 20; /* MB */ - - else if ( end && toupper(*end) == 'K' ) - limit <<= 10; /* KB */ + data->sensor_id = strtol(tok, NULL, 10); break; case 3: @@ -422,7 +412,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) kafka_str++; // skip the FILENAME_KAFKA_SEPARATOR } - if(kafka_str){ const char * at_char_pos = strchr(kafka_str,BROKER_TOPIC_SEPARATOR); if(at_char_pos==NULL) @@ -436,8 +425,9 @@ static AlertJSONData *AlertJSONParseArgs(char *args) * function, will do a fork() and then, in the child process, will call RealAlertJSON, that will not be able to * send kafka data*/ - data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char_pos+1,KAFKA_PARTITION,BcDaemonMode()?0:1,filename); - free(kafka_server); + data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char_pos+1, + KAFKA_PARTITION,BcDaemonMode()?0:1,filename==kafka_str?NULL:filename); + free(kafka_server); } if ( filename ) free(filename); @@ -601,11 +591,28 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, if(!LogJSON_i64(kafka,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000)) FatalError("Not enough buffer space to escape msg string\n"); } + else if(!strncasecmp("sensor_id",type,sizeof "sensor_id")) + { + KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); + if(event != NULL) + { + if(!LogJSON_i32(kafka,JSON_SENSOR_ID_SNORT_NAME,ntohl(((Unified2EventCommon *)event)->sensor_id))) + FatalError("Not enough buffer space to escape msg string\n"); + }else{ + if(!LogJSON_i32(kafka,JSON_SENSOR_ID_SNORT_NAME,SENSOR_NOT_FOUND_NUMBER)) + FatalError("Not enough buffer space to escape msg string\n"); + } + + KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); + if(!LogJSON_i32(kafka,JSON_SENSOR_ID_NAME,jsonData->sensor_id)) + FatalError("Not enough buffer space to escape msg string\n"); + + } else if(!strncasecmp("sig_generator ",type,13)) { if(event != NULL) { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR" "); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); if(!LogJSON_i64(kafka,JSON_SIG_GENERATOR_NAME,ntohl(((Unified2EventCommon *)event)->generator_id))) FatalError("Not enough buffer space to escape msg string\n"); diff --git a/src/sfutil/sf_kafka.c b/src/sfutil/sf_kafka.c index 49427ce..1567cf4 100644 --- a/src/sfutil/sf_kafka.c +++ b/src/sfutil/sf_kafka.c @@ -122,6 +122,7 @@ KafkaLog* KafkaLog_Init ( this->maxBuf = maxBuf; #endif + this->textLog = NULL; /* Force NULL by now */ KafkaLog_Reset(this); return this; From a80dd894886e108efc8a82d572d93846708c723d Mon Sep 17 00:00:00 2001 From: eugenio Date: Tue, 4 Jun 2013 09:36:48 +0000 Subject: [PATCH 037/198] Added sensor_id and sensor_name passed by params. We will send the country code in s_ip and dest_ip too. --- src/output-plugins/spo_alert_json.c | 32 +++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 1c32522..03ecae8 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -95,6 +95,7 @@ #define JSON_TIMESTAMP_NAME "event_timestamp" #define JSON_SENSOR_ID_SNORT_NAME "sensor_id_snort" #define JSON_SENSOR_ID_NAME "sensor_id" +#define JSON_SENSOR_NAME_NAME "sensor_name" #define SENSOR_NOT_FOUND_NUMBER 0 #define JSON_SIG_GENERATOR_NAME "sig_generator" #define JSON_SIG_ID_NAME "sig_id" @@ -141,6 +142,8 @@ #ifdef JSON_GEO_IP #define JSON_SRC_COUNTRY_NAME "src_country" #define JSON_DST_COUNTRY_NAME "dst_country" +#define JSON_SRC_COUNTRY_CODE_NAME "src_country_code" +#define JSON_DST_COUNTRY_CODE_NAME "dst_country_code" #endif // JSON_GEO_IP @@ -167,6 +170,7 @@ typedef struct _AlertJSONData AlertJSONConfig *config; IP_str_assoc * hosts, *nets; uint64_t sensor_id; + char * sensor_name; #ifdef JSON_GEO_IP GeoIP *gi; #endif @@ -317,11 +321,11 @@ IP_str_assoc * SearchStrNet(const uint32_t ip,const IP_str_assoc *netlist){ * Function: ParseJSONArgs(char *) * * Purpose: Process positional args, if any. Syntax is: - * output alert_json: [ ["default"| []]] + * output alert_json: [ ["default"| [sensor_name=name] [sensor_id=id]] * list ::= (,)* * field ::= "dst"|"src"|"ttl" ... - * limit ::= ('G'|'M'|K') - * + * name ::= sensor name + * id ::= number * Arguments: args => argument list * * Returns: void function @@ -332,7 +336,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) int num_toks; AlertJSONData *data; char* filename = NULL; - unsigned long limit = DEFAULT_LIMIT; int i; DEBUG_WRAP(DebugMessage(DEBUG_INIT, "ParseJSONArgs: %s\n", args);); @@ -371,16 +374,24 @@ static AlertJSONData *AlertJSONParseArgs(char *args) break; case 2: - data->sensor_id = strtol(tok, NULL, 10); + case 3: + if(0 == strncmp(tok,"sensor_name=",sizeof "sensor_name="-1)) + data->sensor_name = strdup(tok+sizeof "sensor_name="-1); + else if(0 == strncmp(tok,"sensor_id=",sizeof "sensor_id="-1)) + data->sensor_id = strtol(tok + sizeof "sensor_id="-1, NULL, 10); + else + FatalError("alert_json: error in %s(%i): %s\n", + file_name, file_line, tok); break; - case 3: + case 4: FatalError("alert_json: error in %s(%i): %s\n", file_name, file_line, tok); break; } } if ( !data->jsonargs ) data->jsonargs = strdup(DEFAULT_JSON); + if ( !data->sensor_name ) data->sensor_name = SnortStrdup("-"); if ( !filename ) filename = ProcessFileOption(barnyard2_conf_for_parsing, DEFAULT_FILE); mSplitFree(&toks, num_toks); @@ -606,6 +617,10 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); if(!LogJSON_i32(kafka,JSON_SENSOR_ID_NAME,jsonData->sensor_id)) FatalError("Not enough buffer space to escape msg string\n"); + + KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); + if(!LogJSON_a(kafka,JSON_SENSOR_NAME_NAME,jsonData->sensor_name)) + FatalError("Not enough buffer space to escape msg string\n"); } else if(!strncasecmp("sig_generator ",type,13)) @@ -836,6 +851,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, #ifdef JSON_GEO_IP KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(kafka,JSON_SRC_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_COUNTRY_CODE_NAME,GeoIP_country_code_by_ipnum(jsonData->gi,ipv4)); + #endif } else if(!strncasecmp("dst", type, 3)) @@ -876,6 +894,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, #ifdef JSON_GEO_IP KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(kafka,JSON_DST_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_COUNTRY_CODE_NAME,GeoIP_country_code_by_ipnum(jsonData->gi,ipv4)); #endif } else if(!strncasecmp("icmptype",type,8)) From c6f50a562f520c5c7359264a91f0ad7b1322860c Mon Sep 17 00:00:00 2001 From: eugenio Date: Thu, 27 Jun 2013 18:28:42 +0000 Subject: [PATCH 038/198] Using sf_ip from sfutils module, what simplifies a bit the name resolution Managed a geoip NULL return when ip is not in the database. --- src/output-plugins/spo_alert_json.c | 280 ++++++++++++++++------------ 1 file changed, 162 insertions(+), 118 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 03ecae8..7263e27 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -80,6 +80,7 @@ #define DEFAULT_JSON "timestamp,sensor_id,sig_generator,sig_id,sig_rev,priority,classification,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" +#define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" #define DEFAULT_LIMIT (128*M_BYTES) #define LOG_BUFFER (30*K_BYTES) @@ -154,10 +155,9 @@ typedef struct _AlertJSONConfig } AlertJSONConfig; typedef struct _IP_str_assoc{ - char * str; - char * ipv4_str; - uint32_t ipv4; - uint32_t netmask; + char * human_readable_str; + char * number_as_str; + sfip_t ip; struct _IP_str_assoc * next; } IP_str_assoc; @@ -240,6 +240,60 @@ static void AlertJSONInit(char *args) } +/* Enumeration for FillHostList + * @TODO put in a separate file + */ +typedef enum{HOSTS,NETWORKS,SERVICES,PROTOCOLS} FILLHOSTSLIST_MODE; + +/* + * @TODO put in a separate file + */ +static IP_str_assoc * FillHostList_Host(char *line_buffer){ + /* Assuming format of /etc/hosts: ip hostname */ + char ** toks=NULL; + int num_toks; + IP_str_assoc * node = SnortAlloc(sizeof(IP_str_assoc)); + if(node){ + toks = mSplit((char *)line_buffer, " \t", 2, &num_toks, '\\'); + node->number_as_str = SnortStrdup(toks[0]); + node->human_readable_str = SnortStrdup(toks[1]); + const SFIP_RET ret = sfip_pton(node->number_as_str, &node->ip); + if(ret==SFIP_FAILURE){ + free(node->number_as_str); + free(node->human_readable_str); + free(node); + node=NULL; + } + mSplitFree(&toks, num_toks); + } + return node; +} + +/* + * @TODO put in a separate file + * @TODO same as FillHostList_Host except for node->number_as_str and human_readable_str order. merge? + */ +static IP_str_assoc * FillHostList_Net(char *line_buffer){ + /* Assuming format of /etc/hosts: ip hostname */ + char ** toks=NULL; + int num_toks; + IP_str_assoc * node = SnortAlloc(sizeof(IP_str_assoc)); + if(node){ + toks = mSplit((char *)line_buffer, " \t", 2, &num_toks, '\\'); + node->number_as_str = SnortStrdup(toks[1]); + node->human_readable_str = SnortStrdup(toks[0]); + const SFIP_RET ret = sfip_pton(node->number_as_str, &node->ip); + if(ret==SFIP_FAILURE){ + free(node->number_as_str); + free(node->human_readable_str); + free(node); + node=NULL; + } + mSplitFree(&toks, num_toks); + } + return node; +} + /* * Function FillHostsList * @@ -248,73 +302,70 @@ static void AlertJSONInit(char *args) * * Arguments: filename => route to host/networks file * list => list to fill - * mode => 0 to host mode, 1 to network mode. - * In hots mode, we expect 8.8.8.8 hostname - * In network mode, we expect 8.8.8.8/24 netname. + * mode => See FILLHOSTSLIST_MODE */ -static void FillHostsList(char * filename,IP_str_assoc ** list, const uint8_t mode){ - uint32_t ip_t[4]; - uint32_t netmask = 32; +static void FillHostsList(const char * filename,IP_str_assoc ** list, const FILLHOSTSLIST_MODE mode){ char line_buffer[1024]; FILE * file; - + int aok=1; + if((file = fopen(filename, "r")) == NULL) { FatalError("fopen() alert file %s: %s\n",filename, strerror(errno)); } - IP_str_assoc ** pnode_aux = list; - int aux_ret; - while(NULL != fgets(line_buffer,1024,file)){ - if(line_buffer[0]!='#'){ - *pnode_aux = SnortAlloc(sizeof(IP_str_assoc)); - aux_ret = mode==0? - sscanf(line_buffer,"%d.%d.%d.%d",&ip_t[0],&ip_t[1],&ip_t[2],&ip_t[3]) - : sscanf(line_buffer,"%d.%d.%d.%d/%d",&ip_t[0],&ip_t[1],&ip_t[2],&ip_t[3], - &netmask); - char * name_string = line_buffer; - while(!isblank(*++name_string)); // skipping ip - *name_string = '\0'; - (*pnode_aux)->ipv4_str = SnortStrdup(line_buffer); - while(isblank(*++name_string)); // skipping blank spaces - if((mode==0?4:5) ==aux_ret && name_string && ip_t[0]<0x100 - && ip_t[1]<0x100 &&ip_t[2]<0x100 &&ip_t[3]<0x100) - { - name_string[strlen(name_string)-1] = '\0'; // delete '\n' - (*pnode_aux)->str = SnortStrdup(name_string); - (*pnode_aux)->ipv4 = (ip_t[0]<<24) + (ip_t[1]<<16) + (ip_t[2]<<8) + ip_t[3]; - if(mode==1) - (*pnode_aux)->netmask = 0xFFFFFFFF<next; - }else{ - free((*pnode_aux)->ipv4_str); - free(*pnode_aux); - *pnode_aux=NULL; - } + IP_str_assoc ** llinst_iterator = list; + while(NULL != fgets(line_buffer,1024,file) && aok){ + if(line_buffer[0]!='#' && line_buffer[0]!='\n'){ + IP_str_assoc * ip_str; + + switch(mode){ + case HOSTS: + ip_str = FillHostList_Host(line_buffer); break; + case NETWORKS: + ip_str = FillHostList_Net(line_buffer); break; + case PROTOCOLS: + /* @TODO ip_str = FillHostList_Proto(line_buffer); */break; + case SERVICES: + /* @TODO ip_str = FillHostList_Service(line_buffer); */break; + }; + if(ip_str==NULL) + FatalError("alert_json: cannot parse '%s' line in '%s' file\n",line_buffer,filename); + *llinst_iterator = ip_str; + llinst_iterator = &ip_str->next; + ip_str->next=NULL; } } fclose(file); } -IP_str_assoc * SearchStrIP(const uint32_t ip,const IP_str_assoc *iplist){ +IP_str_assoc * SearchStrIP(uint32_t ip,const IP_str_assoc *iplist){ IP_str_assoc * node; + sfip_t ip_to_cmp; + const SFIP_RET ret = sfip_set_raw(&ip_to_cmp, &ip, AF_INET); + if(ret!=SFIP_SUCCESS) + FatalError("alert_json: Cannot create sfip to compare in line %lu",__LINE__); + for(node = (IP_str_assoc *)iplist;node;node=node->next){ - if(node->ipv4==ip) - return node; + if(sfip_equals(ip_to_cmp,node->ip)) + break; } - return NULL; + return node; } -IP_str_assoc * SearchStrNet(const uint32_t ip,const IP_str_assoc *netlist){ +IP_str_assoc * SearchStrNet(uint32_t ip,const IP_str_assoc *iplist){ IP_str_assoc * node; - for(node = (IP_str_assoc *)netlist;node;node=node->next){ - uint32_t ip_masked = ip&node->netmask; - if(node->ipv4 == ip_masked){ - return node; - } + sfip_t ip_to_cmp; + const SFIP_RET ret = sfip_set_raw(&ip_to_cmp, &ip, AF_INET); + if(ret!=SFIP_SUCCESS) + FatalError("alert_json: Cannot create sfip to compare in line %lu",__LINE__); + + for(node = (IP_str_assoc *)iplist;node;node=node->next){ + if(sfip_fast_cont4(&node->ip,&ip_to_cmp)) + break; } - return NULL; + return node; } /* @@ -336,7 +387,12 @@ static AlertJSONData *AlertJSONParseArgs(char *args) int num_toks; AlertJSONData *data; char* filename = NULL; + char* kafka_str = NULL; int i; + char* hostsListPath = NULL; + char* networksPath = NULL; + char* services = NULL; + char* protocols = NULL; DEBUG_WRAP(DebugMessage(DEBUG_INIT, "ParseJSONArgs: %s\n", args);); data = (AlertJSONData *)SnortAlloc(sizeof(AlertJSONData)); @@ -346,53 +402,43 @@ static AlertJSONData *AlertJSONParseArgs(char *args) FatalError("alert_json: unable to allocate memory!\n"); } if ( !args ) args = ""; - toks = mSplit((char *)args, " \t", 4, &num_toks, '\\'); + toks = mSplit((char *)args, " \t", 0, &num_toks, '\\'); for (i = 0; i < num_toks; i++) { const char* tok = toks[i]; - switch (i) - { - case 0: - if ( !strncasecmp(tok, "stdout",strlen("stdout")) || !strncasecmp(tok, KAFKA_PROT,strlen(KAFKA_PROT))) - filename = SnortStrdup(tok); - - else - filename = ProcessFileOption(barnyard2_conf_for_parsing, tok); - break; - - case 1: - if ( !strncasecmp("default", tok,sizeof "default") ) - { - data->jsonargs = strdup(DEFAULT_JSON); - } - else - { - data->jsonargs = strdup(toks[1]); - } - break; - - case 2: - case 3: - if(0 == strncmp(tok,"sensor_name=",sizeof "sensor_name="-1)) - data->sensor_name = strdup(tok+sizeof "sensor_name="-1); - else if(0 == strncmp(tok,"sensor_id=",sizeof "sensor_id="-1)) - data->sensor_id = strtol(tok + sizeof "sensor_id="-1, NULL, 10); - else - FatalError("alert_json: error in %s(%i): %s\n", + if ( !strncasecmp(tok, "filename=",strlen("filename=")) && !filename){ + filename = SnortStrdup(tok+strlen("filename=")); + }else if(!strncasecmp(tok,"params=",strlen("params=")) && !data->jsonargs){ + data->jsonargs = SnortStrdup(tok+strlen("params=")); + }else if(!strncasecmp(tok, KAFKA_PROT,strlen(KAFKA_PROT)) && !kafka_str){ + kafka_str = SnortStrdup(tok); + }else if ( !strncasecmp("default", tok,strlen("default")) && !data->jsonargs){ + data->jsonargs = SnortStrdup(DEFAULT_JSON); + }else if(!strncmp(tok,"sensor_name=",strlen("sensor_name=")) && !data->sensor_name){ + data->sensor_name = SnortStrdup(tok+strlen("sensor_name=")); + }else if(!strncmp(tok,"sensor_id=",strlen("sensor_id="))){ + data->sensor_id = atol(tok + strlen("sensor_id=")); + }else if(!strncmp(tok,"hostsListPath=",strlen("hostsListPath="))){ + hostsListPath = SnortStrdup(tok+strlen("hostsListPath=")); + }else if(!strncmp(tok,"networksPath=",strlen("networksPath="))){ + networksPath = SnortStrdup(tok+strlen("networksPath=")); + }else if(!strncmp(tok,"services=",strlen("services="))){ + services = SnortStrdup(tok+strlen("services=")); + }else if(!strncmp(tok,"protocols=",strlen("protocols="))){ + protocols = SnortStrdup(tok+strlen("protocols=")); + }else{ + FatalError("alert_json: Cannot parse %s(%i): %s\n", file_name, file_line, tok); - break; - - case 4: - FatalError("alert_json: error in %s(%i): %s\n", - file_name, file_line, tok); - break; } } - if ( !data->jsonargs ) data->jsonargs = strdup(DEFAULT_JSON); + + /* DFEFAULT VALUES */ + if ( !data->jsonargs ) data->jsonargs = SnortStrdup(DEFAULT_JSON); if ( !data->sensor_name ) data->sensor_name = SnortStrdup("-"); if ( !filename ) filename = ProcessFileOption(barnyard2_conf_for_parsing, DEFAULT_FILE); + if ( !kafka_str ) kafka_str = SnortStrdup(DEFAULT_KAFKA_BROKER); mSplitFree(&toks, num_toks); toks = mSplit(data->jsonargs, ",", 128, &num_toks, 0); @@ -400,8 +446,8 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->args = toks; data->numargs = num_toks; - FillHostsList("/etc/hosts",&data->hosts,0); - FillHostsList("/etc/barnyard_networks",&data->nets,1); + FillHostsList("/etc/hosts",&data->hosts,HOSTS); + FillHostsList("/etc/networks",&data->nets,NETWORKS); #ifdef JSON_GEO_IP const char * geoIP_path = "/usr/local/share/GeoIP/GeoIP.dat"; @@ -413,30 +459,24 @@ static AlertJSONData *AlertJSONParseArgs(char *args) #endif // JSON_GEO_IP DEBUG_WRAP(DebugMessage( - DEBUG_INIT, "alert_json: '%s' '%s' %ld\n", filename, data->jsonargs, limit + DEBUG_INIT, "alert_json: '%s' '%s'\n", filename, data->jsonargs );); - char * kafka_str = 0==strncasecmp(filename,KAFKA_PROT,strlen(KAFKA_PROT)) ? filename : NULL; - if(!kafka_str) /* case: filename+kafka://... */ - if((kafka_str = strchr(filename,FILENAME_KAFKA_SEPARATOR))){ - *kafka_str = '\0'; // filename now ends here. - kafka_str++; // skip the FILENAME_KAFKA_SEPARATOR - } - if(kafka_str){ - const char * at_char_pos = strchr(kafka_str,BROKER_TOPIC_SEPARATOR); - if(at_char_pos==NULL) + char * at_char = strchr(kafka_str,BROKER_TOPIC_SEPARATOR); + if(at_char==NULL) FatalError("alert_json: No topic specified, despite the fact a kafka server was given. Use kafka://broker@topic."); - const size_t broker_length = (at_char_pos-(kafka_str+strlen(KAFKA_PROT))); + const size_t broker_length = (at_char-(kafka_str+strlen(KAFKA_PROT))); char * kafka_server = malloc(sizeof(char)*(broker_length+1)); strncpy(kafka_server,kafka_str+strlen(KAFKA_PROT),broker_length); + kafka_server[broker_length] = '\0'; /* * In DaemonMode(), kafka must start in another function, because, in daemon mode, Barnyard2Main will execute this * function, will do a fork() and then, in the child process, will call RealAlertJSON, that will not be able to * send kafka data*/ - data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char_pos+1, + data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char+1, KAFKA_PARTITION,BcDaemonMode()?0:1,filename==kafka_str?NULL:filename); free(kafka_server); } @@ -461,16 +501,16 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) ip_node = data->hosts; while(ip_node){ IP_str_assoc * aux = ip_node->next; - free(ip_node->ipv4_str); - free(ip_node->str); + free(ip_node->human_readable_str); + free(ip_node->number_as_str); free(ip_node); ip_node = aux; } ip_node = data->nets; while(ip_node){ IP_str_assoc * aux = ip_node->next; - free(ip_node->ipv4_str); - free(ip_node->str); + free(ip_node->human_readable_str); + free(ip_node->number_as_str); free(ip_node); ip_node = aux; } @@ -830,8 +870,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, char * ip_str=NULL,*ip_name=NULL; IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); if(ip_str_node){ - ip_str = ip_str_node->ipv4_str; - ip_name = ip_str_node->str; + ip_str = ip_str_node->number_as_str; + ip_name = ip_str_node->human_readable_str; }else{ ip_name = ip_str = _intoa(ipv4, buf, bufLen); } @@ -844,20 +884,22 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, // networks IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); + LogJSON_a(kafka,JSON_SRC_NET_NAME,ip_net?ip_net->number_as_str:"0.0.0.0/0"); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); + LogJSON_a(kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->human_readable_str:"0.0.0.0/0"); #ifdef JSON_GEO_IP + const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); + const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); + LogJSON_a(kafka,JSON_SRC_COUNTRY_NAME,country_name?country_name:"N/A"); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_COUNTRY_CODE_NAME,GeoIP_country_code_by_ipnum(jsonData->gi,ipv4)); - + LogJSON_a(kafka,JSON_SRC_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); #endif } else if(!strncasecmp("dst", type, 3)) { + /* @TODO merge with "src" field */ static char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; const size_t bufLen = sizeof buf; uint32_t ipv4 = IPH_IS_VALID(p) ? ntohl(GET_DST_ADDR(p).s_addr) : 0; @@ -873,8 +915,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, char * ip_str=NULL,*ip_name=NULL; IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); if(ip_str_node){ - ip_str = ip_str_node->ipv4_str; - ip_name = ip_str_node->str; + ip_str = ip_str_node->number_as_str; + ip_name = ip_str_node->human_readable_str; }else{ ip_name = ip_str = _intoa(ipv4, buf, bufLen); } @@ -887,15 +929,17 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, // networks IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_NET_NAME,ip_net?ip_net->ipv4_str:"0.0.0.0/0"); + LogJSON_a(kafka,JSON_DST_NET_NAME,ip_net?ip_net->number_as_str:"0.0.0.0/0"); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->str:"0.0.0.0/0"); + LogJSON_a(kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->human_readable_str:"0.0.0.0/0"); #ifdef JSON_GEO_IP + const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); + const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_COUNTRY_NAME,GeoIP_country_name_by_ipnum(jsonData->gi,ipv4)); + LogJSON_a(kafka,JSON_SRC_COUNTRY_NAME,country_name?country_name:"N/A"); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_COUNTRY_CODE_NAME,GeoIP_country_code_by_ipnum(jsonData->gi,ipv4)); + LogJSON_a(kafka,JSON_SRC_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); #endif } else if(!strncasecmp("icmptype",type,8)) From b03bb291cb3affd37dc6413cc820ca7c93da7090 Mon Sep 17 00:00:00 2001 From: eugenio Date: Tue, 2 Jul 2013 07:50:26 +0000 Subject: [PATCH 039/198] FIXED: Sendig src_country twice by error --- src/output-plugins/spo_alert_json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 7263e27..56595fa 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -937,9 +937,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_COUNTRY_NAME,country_name?country_name:"N/A"); + LogJSON_a(kafka,JSON_DST_COUNTRY_NAME,country_name?country_name:"N/A"); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); + LogJSON_a(kafka,JSON_DST_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); #endif } else if(!strncasecmp("icmptype",type,8)) From 2b98f852844b879249fccb516c79dd2e91f33281 Mon Sep 17 00:00:00 2001 From: eugenio Date: Thu, 4 Jul 2013 14:13:56 +0000 Subject: [PATCH 040/198] Added spread over kafka partitions capacity. --- src/output-plugins/spo_alert_json.c | 7 ++++++- src/sfutil/sf_kafka.c | 17 +++++++++++++---- src/sfutil/sf_kafka.h | 6 ++++-- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 56595fa..e31a3bc 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -393,6 +393,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) char* networksPath = NULL; char* services = NULL; char* protocols = NULL; + int start_partition=KAFKA_PARTITION,end_partition=KAFKA_PARTITION; DEBUG_WRAP(DebugMessage(DEBUG_INIT, "ParseJSONArgs: %s\n", args);); data = (AlertJSONData *)SnortAlloc(sizeof(AlertJSONData)); @@ -428,6 +429,10 @@ static AlertJSONData *AlertJSONParseArgs(char *args) services = SnortStrdup(tok+strlen("services=")); }else if(!strncmp(tok,"protocols=",strlen("protocols="))){ protocols = SnortStrdup(tok+strlen("protocols=")); + }else if(!strncmp(tok,"start_partition=",strlen("start_partition="))){ + start_partition = end_partition = atol(tok+strlen("start_partition=")); + }else if(!strncmp(tok,"end_partition=",strlen("end_partition="))){ + end_partition = atol(tok+strlen("end_partition=")); }else{ FatalError("alert_json: Cannot parse %s(%i): %s\n", file_name, file_line, tok); @@ -477,7 +482,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) * send kafka data*/ data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char+1, - KAFKA_PARTITION,BcDaemonMode()?0:1,filename==kafka_str?NULL:filename); + start_partition,end_partition,BcDaemonMode()?0:1,filename==kafka_str?NULL:filename); free(kafka_server); } if ( filename ) free(filename); diff --git a/src/sfutil/sf_kafka.c b/src/sfutil/sf_kafka.c index 1567cf4..10081e0 100644 --- a/src/sfutil/sf_kafka.c +++ b/src/sfutil/sf_kafka.c @@ -99,8 +99,8 @@ static void KafkaLog_Close (rd_kafka_t* handle) *------------------------------------------------------------------- */ KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int maxBuf, const char * topic, const int partition, bool open, - const char*filename + const char* broker, unsigned int maxBuf, const char * topic, const int start_partition, + const int end_partition, bool open, const char*filename ) { KafkaLog* this; @@ -119,6 +119,12 @@ KafkaLog* KafkaLog_Init ( this->broker = broker ? SnortStrdup(broker) : NULL; this->topic = topic ? SnortStrdup(topic) : NULL; this->handler = open ? KafkaLog_Open(this->broker):NULL; + this->start_partition = this->actual_partition = start_partition; + this->end_partition = end_partition; + + if(this->start_partition > this->end_partition){ + FatalError("alert_json: start_partition > end_partition"); + } this->maxBuf = maxBuf; #endif @@ -165,11 +171,14 @@ bool KafkaLog_Flush(KafkaLog* this) FatalError("There was not possible to solve %s direction",this->broker); } + this->actual_partition++; + if(this->actual_partition>this->end_partition) + this->actual_partition=this->start_partition; /* This if prevent the memory overflow if the server is down */ if(this->handler->rk_state == RD_KAFKA_STATE_DOWN) - free(this->buf); + free(this->buf); else - rd_kafka_produce(this->handler, this->topic, 0, RD_KAFKA_OP_F_FREE, this->buf, this->pos); + rd_kafka_produce(this->handler, this->topic, this->actual_partition, RD_KAFKA_OP_F_FREE, this->buf, this->pos); this->buf = malloc(sizeof(char)*this->maxBuf); #endif diff --git a/src/sfutil/sf_kafka.h b/src/sfutil/sf_kafka.h index dc47dab..cafaf75 100644 --- a/src/sfutil/sf_kafka.h +++ b/src/sfutil/sf_kafka.h @@ -79,7 +79,9 @@ typedef struct _KafkaLog rd_kafka_t * handler; char* broker; char * topic; - int partition; + int start_partition; + int end_partition; + int actual_partition; /* buffer attributes: */ @@ -92,7 +94,7 @@ typedef struct _KafkaLog } KafkaLog; KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int maxBuf, const char * topic, const int partition, bool open, const char *filename + const char* broker, unsigned int maxBuf, const char * topic, const int start_partition, const int end_partition, bool open, const char *filename ); void KafkaLog_Term (KafkaLog* this); From dfea91049be9b9bd3399dfcc2c4a01702db8bcd4 Mon Sep 17 00:00:00 2001 From: eugenio Date: Thu, 4 Jul 2013 14:23:57 +0000 Subject: [PATCH 041/198] Deleted kafka libs and used system ones --- src/sfutil/kafka/librdkafka.a | Bin 137308 -> 0 bytes src/sfutil/kafka/rd.h | 109 ------- src/sfutil/kafka/rdaddr.h | 176 ----------- src/sfutil/kafka/rdcrc32.h | 103 ------- src/sfutil/kafka/rdfile.h | 88 ------ src/sfutil/kafka/rdgz.h | 42 --- src/sfutil/kafka/rdkafka.h | 547 ---------------------------------- src/sfutil/kafka/rdrand.h | 45 --- src/sfutil/kafka/rdtime.h | 89 ------ src/sfutil/kafka/rdtypes.h | 47 --- src/sfutil/sf_kafka.h | 2 +- 11 files changed, 1 insertion(+), 1247 deletions(-) delete mode 100644 src/sfutil/kafka/librdkafka.a delete mode 100644 src/sfutil/kafka/rd.h delete mode 100644 src/sfutil/kafka/rdaddr.h delete mode 100644 src/sfutil/kafka/rdcrc32.h delete mode 100644 src/sfutil/kafka/rdfile.h delete mode 100644 src/sfutil/kafka/rdgz.h delete mode 100644 src/sfutil/kafka/rdkafka.h delete mode 100644 src/sfutil/kafka/rdrand.h delete mode 100644 src/sfutil/kafka/rdtime.h delete mode 100644 src/sfutil/kafka/rdtypes.h diff --git a/src/sfutil/kafka/librdkafka.a b/src/sfutil/kafka/librdkafka.a deleted file mode 100644 index c78e8468ded238461dcc26d065b969d5f7a9c0ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137308 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 diff --git a/src/sfutil/kafka/rd.h b/src/sfutil/kafka/rd.h deleted file mode 100644 index e447555..0000000 --- a/src/sfutil/kafka/rd.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - * librd - Rapid Development C library - * - * Copyright (c) 2012, Magnus Edenhill - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - - - -#pragma once - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "rdtypes.h" - - -#ifndef likely -#define likely(x) __builtin_expect((x),1) -#endif -#ifndef unlikely -#define unlikely(x) __builtin_expect((x),0) -#endif - -#define RD_UNUSED __attribute__((unused)) -#define RD_PACKED __attribute__((packed)) - -#define RD_ARRAY_SIZE(A) (sizeof((A)) / sizeof(*(A))) -#define RD_ARRAYSIZE(A) RD_ARRAY_SIZE(A) -#define RD_SIZEOF(TYPE,MEMBER) sizeof(((TYPE *)NULL)->MEMBER) -#define RD_OFFSETOF(TYPE,MEMBER) ((size_t) &(((TYPE *)NULL)->MEMBER)) - -/** - * Returns the 'I'th array element from static sized array 'A' - * or NULL if 'I' is out of range. - * 'PFX' is an optional prefix to provide the correct return type. - */ -#define RD_ARRAY_ELEM(A,I,PFX...) \ - ((unsigned int)(I) < RD_ARRAY_SIZE(A) ? PFX (A)[(I)] : NULL) - - -#define RD_STRINGIFY(X) # X - - - -#define RD_MIN(a,b) ((a) < (b) ? (a) : (b)) -#define RD_MAX(a,b) ((a) > (b) ? (a) : (b)) - - -/** - * Cap an integer (of any type) to reside within the defined limit. - */ -#define RD_INT_CAP(val,low,hi) \ - ((val) < (low) ? low : ((val) > (hi) ? (hi) : (val))) - - -#define rd_atomic_add(PTR,VAL) __sync_add_and_fetch(PTR,VAL) -#define rd_atomic_sub(PTR,VAL) __sync_sub_and_fetch(PTR,VAL) - -#define rd_atomic_add_prev(PTR,VAL) __sync_fetch_and_add(PTR,VAL) -#define rd_atomic_sub_prev(PTR,VAL) __sync_fetch_and_sub(PTR,VAL) - - - -#ifndef be64toh -#include - -#if __BYTE_ORDER == __BIG_ENDIAN -#define be64toh(x) (x) -#else -# if __BYTE_ORDER == __LITTLE_ENDIAN -#define be64toh(x) bswap_64(x) -# endif -#endif - -#define htobe64(x) be64toh(x) -#endif - - -void rd_init (void); diff --git a/src/sfutil/kafka/rdaddr.h b/src/sfutil/kafka/rdaddr.h deleted file mode 100644 index eb415ea..0000000 --- a/src/sfutil/kafka/rdaddr.h +++ /dev/null @@ -1,176 +0,0 @@ -/* - * librd - Rapid Development C library - * - * Copyright (c) 2012, Magnus Edenhill - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -#include -#include -#include - -/** - * rd_sockaddr_inx_t is a union for either ipv4 or ipv6 sockaddrs. - * It provides conveniant abstraction of AF_INET* agnostic operations. - */ -typedef union { - struct sockaddr_in in; - struct sockaddr_in6 in6; -} rd_sockaddr_inx_t; -#define sinx_family in.sin_family -#define sinx_addr in.sin_addr -#define RD_SOCKADDR_INX_LEN(sinx) \ - ((sinx)->sinx_family == AF_INET ? sizeof(struct sockaddr_in) : \ - (sinx)->sinx_family == AF_INET6 ? sizeof(struct sockaddr_in6): \ - sizeof(rd_sockaddr_inx_t)) -#define RD_SOCKADDR_INX_PORT(sinx) \ - ((sinx)->sinx_family == AF_INET ? (sinx)->in.sin_port : \ - (sinx)->sinx_family == AF_INET6 ? (sinx)->in6.sin6_port : 0) - -#define RD_SOCKADDR_INX_PORT_SET(sinx,port) do { \ - if ((sinx)->sinx_family == AF_INET) \ - (sinx)->in.sin_port = port; \ - else if ((sinx)->sinx_family == AF_INET6) \ - (sinx)->in6.sin6_port = port; \ - } while (0) - - - -/** - * Returns a thread-local temporary string (may be called up to 32 times - * without buffer wrapping) containing the human string representation - * of the sockaddr (which should be AF_INET or AF_INET6 at this point). - * If the RD_SOCKADDR2STR_F_PORT is provided the port number will be - * appended to the string. - * IPv6 address enveloping ("[addr]:port") will also be performed - * if .._F_PORT is set. - */ -#define RD_SOCKADDR2STR_F_PORT 0x1 /* Append the port. */ -#define RD_SOCKADDR2STR_F_RESOLVE 0x2 /* Try to resolve address to hostname. */ -#define RD_SOCKADDR2STR_F_FAMILY 0x4 /* Prepend address family. */ -#define RD_SOCKADDR2STR_F_NICE /* Nice and friendly output */ \ - (RD_SOCKADDR2STR_F_PORT | RD_SOCKADDR2STR_F_RESOLVE) -const char *rd_sockaddr2str (const void *addr, int flags); - - -/** - * Splits a node:service definition up into their node and svc counterparts - * suitable for passing to getaddrinfo(). - * Returns NULL on success (and temporarily available pointers in '*node' - * and '*svc') or error string on failure. - * - * Thread-safe but returned buffers in '*node' and '*svc' are only - * usable until the next call to rd_addrinfo_prepare() in the same thread. - */ -const char *rd_addrinfo_prepare (const char *nodesvc, - char **node, char **svc); - - - -typedef struct rd_sockaddr_list_s { - int rsal_cnt; - int rsal_curr; - rd_sockaddr_inx_t rsal_addr[0]; -} rd_sockaddr_list_t; - - -/** - * Returns the next address from a sockaddr list and updates - * the current-index to point to it. - * - * Typical usage is for round-robin connection attempts or similar: - * while (1) { - * rd_sockaddr_inx_t *sinx = rd_sockaddr_list_next(my_server_list); - * if (do_connect((struct sockaddr *)sinx) == -1) { - * sleep(1); - * continue; - * } - * ... - * } - * - */ - -static inline rd_sockaddr_inx_t * -rd_sockaddr_list_next (rd_sockaddr_list_t *rsal) RD_UNUSED; -static inline rd_sockaddr_inx_t * -rd_sockaddr_list_next (rd_sockaddr_list_t *rsal) { - rsal->rsal_curr = (rsal->rsal_curr + 1) % rsal->rsal_cnt; - return &rsal->rsal_addr[rsal->rsal_curr]; -} - - -#define RD_SOCKADDR_LIST_FOREACH(sinx, rsal) \ - for ((sinx) = &(rsal)->rsal_addr[0] ; \ - (sinx) < &(rsal)->rsal_addr[(rsal)->rsal_len] ; \ - (sinx)++) - -/** - * Wrapper for getaddrinfo(3) that performs these additional tasks: - * - Input is a combined "[:]" string, with support for - * IPv6 enveloping ("[addr]:port"). - * - Returns a rd_sockaddr_list_t which must be freed with - * rd_sockaddr_list_destroy() when done with it. - * - Automatically shuffles the returned address list to provide - * round-robin (unless RD_AI_NOSHUFFLE is provided in 'flags'). - * - * Thread-safe. - */ -#define RD_AI_NOSHUFFLE 0x10000000 /* Dont shuffle returned address list. - * FIXME: Guessing non-used bits like this - * is a bad idea. */ - -rd_sockaddr_list_t *rd_getaddrinfo (const char *nodesvc, const char *defsvc, - int flags, int family, - int socktype, int protocol, - const char **errstr); - - - -/** - * Frees a sockaddr list. - * - * Thread-safe. - */ -void rd_sockaddr_list_destroy (rd_sockaddr_list_t *rsal); - - - -/** - * Returns the human readable name of a socket family. - */ -static const char *rd_family2str (int af) RD_UNUSED; -static const char *rd_family2str (int af) { - switch(af){ - case AF_LOCAL: - return "local"; - case AF_INET: - return "inet"; - case AF_INET6: - return "inet6"; - default: - return "af?"; - }; -} diff --git a/src/sfutil/kafka/rdcrc32.h b/src/sfutil/kafka/rdcrc32.h deleted file mode 100644 index a79e3f5..0000000 --- a/src/sfutil/kafka/rdcrc32.h +++ /dev/null @@ -1,103 +0,0 @@ -/** - * \file rdcrc32.h - * Functions and types for CRC checks. - * - * Generated on Tue May 8 17:36:59 2012, - * by pycrc v0.7.10, http://www.tty1.net/pycrc/ - * - * NOTE: Contains librd modifications: - * - rd_crc32() helper. - * - __RDCRC32___H__ define (was missing the '32' part). - * - * using the configuration: - * Width = 32 - * Poly = 0x04c11db7 - * XorIn = 0xffffffff - * ReflectIn = True - * XorOut = 0xffffffff - * ReflectOut = True - * Algorithm = table-driven - *****************************************************************************/ -#ifndef __RDCRC32___H__ -#define __RDCRC32___H__ - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - - -/** - * The definition of the used algorithm. - *****************************************************************************/ -#define CRC_ALGO_TABLE_DRIVEN 1 - - -/** - * The type of the CRC values. - * - * This type must be big enough to contain at least 32 bits. - *****************************************************************************/ -typedef uint32_t rd_crc32_t; - - -/** - * Reflect all bits of a \a data word of \a data_len bytes. - * - * \param data The data word to be reflected. - * \param data_len The width of \a data expressed in number of bits. - * \return The reflected data. - *****************************************************************************/ -rd_crc32_t rd_crc32_reflect(rd_crc32_t data, size_t data_len); - - -/** - * Calculate the initial crc value. - * - * \return The initial crc value. - *****************************************************************************/ -static inline rd_crc32_t rd_crc32_init(void) -{ - return 0xffffffff; -} - - -/** - * Update the crc value with new data. - * - * \param crc The current crc value. - * \param data Pointer to a buffer of \a data_len bytes. - * \param data_len Number of bytes in the \a data buffer. - * \return The updated crc value. - *****************************************************************************/ -rd_crc32_t rd_crc32_update(rd_crc32_t crc, const unsigned char *data, size_t data_len); - - -/** - * Calculate the final crc value. - * - * \param crc The current crc value. - * \return The final crc value. - *****************************************************************************/ -static inline rd_crc32_t rd_crc32_finalize(rd_crc32_t crc) -{ - return crc ^ 0xffffffff; -} - - -/** - * Wrapper for performing CRC32 on the provided buffer. - */ -static inline rd_crc32_t rd_crc32 (const char *data, size_t data_len) { - return rd_crc32_finalize(rd_crc32_update(rd_crc32_init(), - (const unsigned char *)data, - data_len)); -} - -#ifdef __cplusplus -} /* closing brace for extern "C" */ -#endif - -#endif /* __RDCRC32___H__ */ diff --git a/src/sfutil/kafka/rdfile.h b/src/sfutil/kafka/rdfile.h deleted file mode 100644 index 7ce7b6b..0000000 --- a/src/sfutil/kafka/rdfile.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * librd - Rapid Development C library - * - * Copyright (c) 2012, Magnus Edenhill - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -#include -#include -#include -#include -#include - - -/** - * Behaves pretty much like basename(3) but does not alter the - * input string in any way. - */ -const char *rd_basename (const char *path); - -/** - * Returns the current directory in a static buffer. - */ -const char *rd_pwd (void); - - -/** - * Returns the size of the file, or -1 on failure. - */ -ssize_t rd_file_size (const char *path); - -/** - * Returns the size of the file already opened, or -1 on failure. - */ -ssize_t rd_file_size_fd (int fd); - - -/** - * Performs stat(2) on 'path' and returns 'struct stat.st_mode' on success - * or 0 on failure. - * - * Example usage: - * if (S_ISDIR(rd_file_mode(mypath))) - * .. - */ -mode_t rd_file_mode (const char *path); - - -/** - * Opens the specified file and reads the entire content into a malloced - * buffer which is null-terminated. The actual length of the buffer, without - * the conveniant null-terminator, is returned in '*lenp'. - * The buffer is returned, or NULL on failure. - */ -char *rd_file_read (const char *path, int *lenp); - - -/** - * Writes 'buf' of 'len' bytes to 'path'. - * Hint: Use O_APPEND or O_TRUNC in 'flags'. - * Returns 0 on success or -1 on error. - * See open(2) for more info. - */ -int rd_file_write (const char *path, const char *buf, int len, - int flags, mode_t mode); diff --git a/src/sfutil/kafka/rdgz.h b/src/sfutil/kafka/rdgz.h deleted file mode 100644 index db6cb12..0000000 --- a/src/sfutil/kafka/rdgz.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * librd - Rapid Development C library - * - * Copyright (c) 2012, Magnus Edenhill - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -/** - * Simple gzip decompression returning the inflated data - * in a malloced buffer. - * '*decompressed_lenp' must be 0 if the length of the uncompressed data - * is not known in which case it will be calculated. - * The returned buffer is nul-terminated (the actual allocated length - * is '*decompressed_lenp'+1. - * - * The decompressed length is returned in '*decompressed_lenp'. - */ -void *rd_gz_decompress (void *compressed, int compressed_len, - uint64_t *decompressed_lenp); diff --git a/src/sfutil/kafka/rdkafka.h b/src/sfutil/kafka/rdkafka.h deleted file mode 100644 index 1affb30..0000000 --- a/src/sfutil/kafka/rdkafka.h +++ /dev/null @@ -1,547 +0,0 @@ -/* - * librdkafka - Apache Kafka C library - * - * Copyright (c) 2012, Magnus Edenhill - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -#include -#include -#include -#include - -#ifndef WITH_LIBRD - -#include "rd.h" -#include "rdaddr.h" - -#define RD_POLL_INFINITE -1 -#define RD_POLL_NOWAIT 0 - -#else - -#include -#include -#endif - -#define RD_KAFKA_TOPIC_MAXLEN 256 - -typedef enum { - RD_KAFKA_PRODUCER, - RD_KAFKA_CONSUMER, -} rd_kafka_type_t; - -typedef enum { - RD_KAFKA_STATE_DOWN, - RD_KAFKA_STATE_CONNECTING, - RD_KAFKA_STATE_UP, -} rd_kafka_state_t; - - -typedef enum { - /* Internal errors to rdkafka: */ - RD_KAFKA_RESP_ERR__BAD_MSG = -199, - RD_KAFKA_RESP_ERR__BAD_COMPRESSION = -198, - RD_KAFKA_RESP_ERR__FAIL = -197, /* See rko_payload for error string */ - /* Standard Kafka errors: */ - RD_KAFKA_RESP_ERR_UNKNOWN = -1, - RD_KAFKA_RESP_ERR_NO_ERROR = 0, - RD_KAFKA_RESP_ERR_OFFSET_OUT_OF_RANGE = 1, - RD_KAFKA_RESP_ERR_INVALID_MSG = 2, - RD_KAFKA_RESP_ERR_WRONG_PARTITION = 3, - RD_KAFKA_RESP_ERR_INVALID_FETCH_SIZE = 4, -} rd_kafka_resp_err_t; - - -/** - * Optional configuration struct passed to rd_kafka_new*(). - * See head of rdkafka.c for defaults. - * See comment below for rd_kafka_defaultconf use. - */ -typedef struct rd_kafka_conf_s { - int max_msg_size; /* Maximum receive message size. - * This is a safety precaution to - * avoid memory exhaustion in case of - * protocol hickups. */ - - int flags; -#define RD_KAFKA_CONF_F_APP_OFFSET_STORE 0x1 /* No automatic offset storage - * will be performed. The - * application needs to - * call rd_kafka_offset_store() - * explicitly. - * This may be used to make sure - * a message is properly handled - * before storing the offset. - * If not set, and an offset - * storage is available, the - * offset will be stored - * just prior to passing the - * message to the application.*/ - - struct { - int poll_interval; /* Time in milliseconds to sleep before - * trying to FETCH again if the broker - * did not return any messages for - * the last FETCH call. - * I.e.: idle poll interval. */ - - int replyq_low_thres; /* The low water threshold for the - * reply queue. - * I.e.: how many messages we'll try - * to keep in the reply queue at any - * given time. - * The reply queue is the queue of - * read messages from the broker - * that are still to be passed to - * the application. */ - - uint32_t max_size; /* The maximum size to be returned - * by FETCH. */ - - char *offset_file; /* File to read/store current - * offset from/in. - * If the path is a directory then a - * filename is generated (including - * the topic and partition) and - * appended. */ - int offset_file_flags; /* open(2) flags. */ -#define RD_KAFKA_OFFSET_FILE_FLAGMASK (O_SYNC|O_ASYNC) - - - /* For internal use. - * Use the rd_kafka_new_consumer() API instead. */ - char *topic; /* Topic to consume. */ - uint32_t partition; /* Partition to consume. */ - uint64_t offset; /* Initial offset. */ - - } consumer; - - - struct { - int max_outq_msg_cnt; /* Maximum number of messages allowed - * in the output queue. - * If this number is exceeded the - * rd_kafka_produce() call will - * return with -1 and errno - * set to ENOBUFS. */ - } producer; - -} rd_kafka_conf_t; - - - -typedef enum { - RD_KAFKA_OP_PRODUCE, /* Application -> Kafka thread */ - RD_KAFKA_OP_FETCH, /* Kafka thread -> Application */ - RD_KAFKA_OP_ERR, /* Kafka thread -> Application */ -} rd_kafka_op_type_t; - -typedef struct rd_kafka_op_s { - TAILQ_ENTRY(rd_kafka_op_s) rko_link; - rd_kafka_op_type_t rko_type; - char *rko_topic; - uint32_t rko_partition; - int rko_flags; -#define RD_KAFKA_OP_F_FREE 0x1 /* Free the payload when done with it. */ -#define RD_KAFKA_OP_F_FREE_TOPIC 0x2 /* Free the topic when done with it. */ - /* For PRODUCE and ERR */ - char *rko_payload; - int rko_len; - /* For FETCH */ - uint64_t rko_offset; -#define rko_max_size rko_len - /* For replies */ - rd_kafka_resp_err_t rko_err; - int8_t rko_compression; - int64_t rko_offset_len; /* Length to use to advance the offset. */ -} rd_kafka_op_t; - - -typedef struct rd_kafka_q_s { - pthread_mutex_t rkq_lock; - pthread_cond_t rkq_cond; - TAILQ_HEAD(, rd_kafka_op_s) rkq_q; - int rkq_qlen; -} rd_kafka_q_t; - - - - - -/** - * Kafka handle. - */ -typedef struct rd_kafka_s { - rd_kafka_q_t rk_op; /* application -> kafka operation queue */ - rd_kafka_q_t rk_rep; /* kafka -> application reply queue */ - struct { - char name[128]; - rd_sockaddr_list_t *rsal; - int curr_addr; - int s; /* TCP socket */ - struct { - uint64_t tx_bytes; - uint64_t tx; /* Kafka-messages (not payload msgs) */ - uint64_t rx_bytes; - uint64_t rx; /* Kafka messages (not payload msgs) */ - } stats; - } rk_broker; - rd_kafka_conf_t rk_conf; - int rk_flags; - int rk_terminate; - pthread_t rk_thread; - pthread_mutex_t rk_lock; - int rk_refcnt; - rd_kafka_type_t rk_type; - rd_kafka_state_t rk_state; - struct timeval rk_tv_state_change; - union { - struct { - char *topic; - uint32_t partition; - uint64_t offset; - uint64_t app_offset; - int offset_file_fd; - } consumer; - } rk_u; -#define rk_consumer rk_u.consumer - struct { - char msg[512]; - int err; /* errno */ - } rk_err; -} rd_kafka_t; - - -/** - * Accessor functions. - * - * Locality: any thread - */ -#define rd_kafka_name(rk) ((rk)->rk_broker.name) -#define rd_kafka_state(rk) ((rk)->rk_state) - - -/** - * Destroy the Kafka handle. - * - * Locality: application thread - */ -void rd_kafka_destroy (rd_kafka_t *rk); - - -/** - * Creates a new Kafka handle and starts its operation according to the - * specified 'type'. - * - * The 'broker' argument depicts the address to the Kafka broker (sorry, - * no ZooKeeper support at this point) in the standard "[:]" format - * - * If 'broker' is NULL it defaults to "localhost:9092". - * - * If the 'broker' node name resolves to multiple addresses (and possibly - * address families) all will be used for connection attempts in - * round-robin fashion. - * - * 'conf' is an optional struct that will be copied to replace rdkafka's - * default configuration. See the 'rd_kafka_conf_t' type for more information. - * - * NOTE: Make sure SIGPIPE is either ignored or handled by the calling application. - * - * - * Returns the Kafka handle. - * - * To destroy the Kafka handle, use rd_kafka_destroy(). - * - * Locality: application thread - */ -rd_kafka_t *rd_kafka_new (rd_kafka_type_t type, const char *broker, - const rd_kafka_conf_t *conf); - -/** - * Creates a new Kafka consumer handle and sets it up for fetching messages - * from 'topic' + 'partion', beginning at 'offset'. - * - * If 'conf->consumer.offset_file' is non-NULL then the 'offset' parameter is - * ignored and the file's offset is used instead. - * - * Returns the Kafka handle. - * - * To destroy the Kafka handle, use rd_kafka_destroy(). - * - * Locality: application thread - */ -rd_kafka_t *rd_kafka_new_consumer (const char *broker, - const char *topic, - uint32_t partition, - uint64_t offset, - const rd_kafka_conf_t *conf); - -/** - * Fetches kafka messages from the internal reply queue that the kafka - * thread tries to keep populated. - * - * Will block until 'timeout_ms' expires (milliseconds, RD_POLL_NOWAIT or - * RD_POLL_INFINITE) or until a message is returned. - * - * The caller must check the reply's rko_err (RD_KAFKA_ERR_*) to distinguish - * between errors and actual data messages. - * - * Communication failure propagation: - * If rko_err is RD_KAFKA_ERR__FAIL it means a critical error has occured - * and the connection to the broker has been torn down. The application - * does not need to take any action but should log the contents of - * rko->rko_payload. - * - * Returns NULL on timeout or an 'rd_kafka_op_t *' reply on success. - * - * Locality: application thread - */ -rd_kafka_op_t *rd_kafka_consume (rd_kafka_t *rk, int timeout_ms); - -/** - * Stores the current offset in whatever storage the handle has defined. - * Must only be called by the application if RD_KAFKA_CONF_F_APP_OFFSET_STORE - * is set in conf.flags. - * - * Locality: any thread - */ -int rd_kafka_offset_store (rd_kafka_t *rk, uint64_t offset); - - - -/** - * Produce and send a single message to the broker. - * - * There are two alternatives for 'payload': - * 1) static data that will not change or go away during the lifetime - * of the rd_kafka_t handle. *This is uncommon*. - * - * 2) malloc():ed data that librdkafka will free when done with it, - * this requires the RD_KAFKA_OP_F_FREE flag to be set in msgflags. - * - * There is currently no way for the application to know when librdkafka is - * done with the payload, so the control of freeing the payload must be left - * to librdkafka as described in alternative 2) above. - * - * - * Returns 0 on success or -1 on error (see errno for details) - * - * errno: - * ENOBUFS - The conf.producer.max_outq_msg_cnt would be exceeded. - * - * Locality: application thread - */ -int rd_kafka_produce (rd_kafka_t *rk, char *topic, uint32_t partition, - int msgflags, char *payload, size_t len); - -/** - * Destroys an op as returned by rd_kafka_consume(). - * - * Locality: any thread - */ -void rd_kafka_op_destroy (rd_kafka_t *rk, rd_kafka_op_t *rko); - - -/** - * Returns a human readable representation of a kafka error. - */ -const char *rd_kafka_err2str (rd_kafka_resp_err_t err); - - -/** - * Returns the current out queue length (ops waiting to be sent to the broker). - * - * Locality: any thread - */ -static inline int rd_kafka_outq_len (rd_kafka_t *rk) __attribute__((unused)); -static inline int rd_kafka_outq_len (rd_kafka_t *rk) { - return rk->rk_op.rkq_qlen; -} - - -/** - * Returns the current reply queue length (messages from the broker waiting - * for the application thread to consume). - * - * Locality: any thread - */ -static inline int rd_kafka_replyq_len (rd_kafka_t *rk) __attribute__((unused)); -static inline int rd_kafka_replyq_len (rd_kafka_t *rk) { - return rk->rk_rep.rkq_qlen; -} - - - - -/** - * The default configuration. - * When providing your own configuration to the rd_kafka_new_*() calls - * its advisable to base it on this default configuration and only - * change the relevant parts. - * I.e.: - * - * rd_kafka_conf_t myconf = rd_kafka_defaultconf; - * myconf.consumer.offset_file = "/var/kafka/offsets/"; - * rk = rd_kafka_new_consumer(, ... &myconf); - */ -extern const rd_kafka_conf_t rd_kafka_defaultconf; - - -/** - * Builtin (default) log sink: print to stderr - */ -void rd_kafka_log_print (const rd_kafka_t *rk, int level, - const char *fac, const char *buf); - - -/** - * Builtin log sink: print to syslog. - */ -void rd_kafka_log_syslog (const rd_kafka_t *rk, int level, - const char *fac, const char *buf); - - -/** - * Set logger function. - * The default is to print to stderr, but a syslog is also available, - * see rd_kafka_log_(print|syslog) for the builtin alternatives. - * Alternatively the application may provide its own logger callback. - * Or pass 'func' as NULL to disable logging. - * - * NOTE: 'rk' may be passed as NULL. - */ -void rd_kafka_set_logger (void (*func) (const rd_kafka_t *rk, int level, - const char *fac, const char *buf)); - - - -#ifdef NEED_RD_KAFKAPROTO_DEF -/* - * Kafka protocol definitions. - * This is kept as an opt-in ifdef-space to avoid name space cluttering - * for the application while still keeping the implementation to - * just two files for easy inclusion in applications in case the library - * variant is not desired. - */ - - -#define RD_KAFKA_PORT 9092 -#define RD_KAFKA_PORT_STR "9092" - -/** - * Generic Request header. - */ -struct rd_kafkap_req { - uint32_t rkpr_len; - uint16_t rkpr_type; -#define RD_KAFKAP_PRODUCE 0 -#define RD_KAFKAP_FETCH 1 -#define RD_KAFKAP_MULTIFETCH 2 -#define RD_KAFKAP_MULTIPRODUCE 3 -#define RD_KAFKAP_OFFSETS 4 - uint16_t rkpr_topic_len; - char rkpr_topic[0]; /* TOPIC and PARTITION follows */ -} RD_PACKED; - - -/** - * Generic Multi-Request header. - */ -struct rd_kafkap_multireq { - uint32_t rkpmr_len; - uint16_t rkpmr_type; - uint16_t rkpmr_topicpart_cnt; - - uint32_t rkpr_topic_len; - char rkpr_topic[0]; /* TOPIC and PARTITION follows */ -} RD_PACKED; - - -/** - * Generic Response header. - */ -struct rd_kafkap_resp { - uint32_t rkprp_len; - int16_t rkprp_error; /* rd_kafka_resp_err_t */ -} RD_PACKED; - - - -/** - * MESSAGE header - */ -struct rd_kafkap_msg { - uint32_t rkpm_len; - uint8_t rkpm_magic; -#define RD_KAFKAP_MSG_MAGIC_NO_COMPRESSION_ATTR 0 /* Not supported. */ -#define RD_KAFKAP_MSG_MAGIC_COMPRESSION_ATTR 1 - uint8_t rkpm_compression; -#define RD_KAFKAP_MSG_COMPRESSION_NONE 0 -#define RD_KAFKAP_MSG_COMPRESSION_GZIP 1 -#define RD_KAFKAP_MSG_COMPRESSION_SNAPPY 2 - uint32_t rkpm_cksum; - char rkpm_payload[0]; -} RD_PACKED; - -/** - * PRODUCE header, directly follows the request header. - */ -struct rd_kafkap_produce { - uint32_t rkpp_msgs_len; - struct rd_kafkap_msg rkpp_msgs[0]; -} RD_PACKED; - - -/** - * FETCH request header, directly follows the request header. - */ -struct rd_kafkap_fetch_req { - uint64_t rkpfr_offset; - uint32_t rkpfr_max_size; -} RD_PACKED; - -/** - * FETCH response header, directly follows the response header. - */ -struct rd_kafkap_fetch_resp { - struct rd_kafkap_msg rkpfrp_msgs[0]; -} RD_PACKED; - - - - -/** - * Helper struct containing a protocol-encoded topic+partition. - */ -struct rd_kafkap_topicpart { - int rkptp_len; - char rkptp_buf[0]; -}; - - -#endif /* NEED_KAFKAPROTO_DEF */ - diff --git a/src/sfutil/kafka/rdrand.h b/src/sfutil/kafka/rdrand.h deleted file mode 100644 index eac5ef9..0000000 --- a/src/sfutil/kafka/rdrand.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * librd - Rapid Development C library - * - * Copyright (c) 2012, Magnus Edenhill - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - - -/** - * Returns a random (using rand(3)) number between 'low'..'high' (inclusive). - */ -static inline int rd_jitter (int low, int high) RD_UNUSED; -static inline int rd_jitter (int low, int high) { - return (low + (rand() % (high+1))); - -} - - -/** - * Shuffles (randomizes) an array using the modern Fisher-Yates algorithm. - */ -void rd_array_shuffle (void *base, size_t nmemb, size_t entry_size); diff --git a/src/sfutil/kafka/rdtime.h b/src/sfutil/kafka/rdtime.h deleted file mode 100644 index 017a33a..0000000 --- a/src/sfutil/kafka/rdtime.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * librd - Rapid Development C library - * - * Copyright (c) 2012, Magnus Edenhill - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - - -#ifndef TIMEVAL_TO_TIMESPEC -#define TIMEVAL_TO_TIMESPEC(tv,ts) do { \ - (ts)->tv_sec = (tv)->tv_sec; \ - (ts)->tv_nsec = (tv)->tv_usec * 1000; \ - } while (0) - -#define TIMESPEC_TO_TIMEVAL(tv, ts) do { \ - (tv)->tv_sec = (ts)->tv_sec; \ - (tv)->tv_usec = (ts)->tv_nsec / 1000; \ - } while (0) -#endif - -#define TIMESPEC_TO_TS(ts) \ - (((rd_ts_t)(ts)->tv_sec * 1000000LLU) + ((ts)->tv_nsec / 1000)) - -#define TS_TO_TIMESPEC(ts,tsx) do { \ - (ts)->tv_sec = (tsx) / 1000000; \ - (ts)->tv_nsec = ((tsx) % 1000000) * 1000; \ - if ((ts)->tv_nsec > 1000000000LLU) { \ - (ts)->tv_sec++; \ - (ts)->tv_nsec -= 1000000000LLU; \ - } \ - } while (0) - -#define TIMESPEC_CLEAR(ts) ((ts)->tv_sec = (ts)->tv_nsec = 0LLU) - - -static inline rd_ts_t rd_clock (void) RD_UNUSED; -static inline rd_ts_t rd_clock (void) { -#ifdef __APPLE__ - /* No monotonic clock on Darwin */ - struct timeval tv; - gettimeofday(&tv, NULL); - TIMEVAL_TO_TIMESPEC(&tv, &ts); - return ((rd_ts_t)tv.tv_sec * 1000000LLU) + (rd_ts_t)tv.tv_usec; -#else - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - return ((rd_ts_t)ts.tv_sec * 1000000LLU) + - ((rd_ts_t)ts.tv_nsec / 1000LLU); -#endif -} - - - -/** - * Thread-safe version of ctime() that strips the trailing newline. - */ -static inline const char *rd_ctime (const time_t *t) RD_UNUSED; -static inline const char *rd_ctime (const time_t *t) { - static __thread char ret[27]; - - ctime_r(t, ret); - - ret[25] = '\0'; - - return ret; -} diff --git a/src/sfutil/kafka/rdtypes.h b/src/sfutil/kafka/rdtypes.h deleted file mode 100644 index ed3efc3..0000000 --- a/src/sfutil/kafka/rdtypes.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * librd - Rapid Development C library - * - * Copyright (c) 2012, Magnus Edenhill - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -#include - - -/* - * Fundamental types - */ - - - - -typedef pthread_mutex_t rd_mutex_t; -typedef pthread_rwlock_t rd_rwlock_t; -typedef pthread_cond_t rd_cond_t; - - -/* Timestamp (microseconds) */ -typedef uint64_t rd_ts_t; diff --git a/src/sfutil/sf_kafka.h b/src/sfutil/sf_kafka.h index cafaf75..6a90184 100644 --- a/src/sfutil/sf_kafka.h +++ b/src/sfutil/sf_kafka.h @@ -44,7 +44,7 @@ #include "debug.h" /* for INLINE */ #include "sf_textlog.h" #ifdef JSON_KAFKA -#include "kafka/rdkafka.h" +#include "librdkafka/rdkafka.h" #endif From 67a8c031900ede7796f4b28566469eef980d18a5 Mon Sep 17 00:00:00 2001 From: eugenio Date: Mon, 8 Jul 2013 09:57:39 +0000 Subject: [PATCH 042/198] The geoip library path is now passed by param. --- src/output-plugins/spo_alert_json.c | 67 ++++++++++++++++++----------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index e31a3bc..dc7258c 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -393,6 +393,9 @@ static AlertJSONData *AlertJSONParseArgs(char *args) char* networksPath = NULL; char* services = NULL; char* protocols = NULL; + #ifdef JSON_GEO_IP + char * geoIP_path = NULL; + #endif int start_partition=KAFKA_PARTITION,end_partition=KAFKA_PARTITION; DEBUG_WRAP(DebugMessage(DEBUG_INIT, "ParseJSONArgs: %s\n", args);); @@ -417,22 +420,26 @@ static AlertJSONData *AlertJSONParseArgs(char *args) kafka_str = SnortStrdup(tok); }else if ( !strncasecmp("default", tok,strlen("default")) && !data->jsonargs){ data->jsonargs = SnortStrdup(DEFAULT_JSON); - }else if(!strncmp(tok,"sensor_name=",strlen("sensor_name=")) && !data->sensor_name){ + }else if(!strncasecmp(tok,"sensor_name=",strlen("sensor_name=")) && !data->sensor_name){ data->sensor_name = SnortStrdup(tok+strlen("sensor_name=")); - }else if(!strncmp(tok,"sensor_id=",strlen("sensor_id="))){ + }else if(!strncasecmp(tok,"sensor_id=",strlen("sensor_id="))){ data->sensor_id = atol(tok + strlen("sensor_id=")); - }else if(!strncmp(tok,"hostsListPath=",strlen("hostsListPath="))){ + }else if(!strncasecmp(tok,"hostsListPath=",strlen("hostsListPath="))){ hostsListPath = SnortStrdup(tok+strlen("hostsListPath=")); - }else if(!strncmp(tok,"networksPath=",strlen("networksPath="))){ + }else if(!strncasecmp(tok,"networksPath=",strlen("networksPath="))){ networksPath = SnortStrdup(tok+strlen("networksPath=")); - }else if(!strncmp(tok,"services=",strlen("services="))){ + }else if(!strncasecmp(tok,"services=",strlen("services="))){ services = SnortStrdup(tok+strlen("services=")); - }else if(!strncmp(tok,"protocols=",strlen("protocols="))){ + }else if(!strncasecmp(tok,"protocols=",strlen("protocols="))){ protocols = SnortStrdup(tok+strlen("protocols=")); - }else if(!strncmp(tok,"start_partition=",strlen("start_partition="))){ + }else if(!strncasecmp(tok,"start_partition=",strlen("start_partition="))){ start_partition = end_partition = atol(tok+strlen("start_partition=")); - }else if(!strncmp(tok,"end_partition=",strlen("end_partition="))){ + }else if(!strncasecmp(tok,"end_partition=",strlen("end_partition="))){ end_partition = atol(tok+strlen("end_partition=")); + #ifdef JSON_GEO_IP + }else if(!strncasecmp(tok,"geoip=",strlen("geoip="))){ + geoIP_path = SnortStrdup(tok+strlen("geoip=")); + #endif // JSON_GEO_IP }else{ FatalError("alert_json: Cannot parse %s(%i): %s\n", file_name, file_line, tok); @@ -455,11 +462,16 @@ static AlertJSONData *AlertJSONParseArgs(char *args) FillHostsList("/etc/networks",&data->nets,NETWORKS); #ifdef JSON_GEO_IP - const char * geoIP_path = "/usr/local/share/GeoIP/GeoIP.dat"; - data->gi = GeoIP_open(geoIP_path, GEOIP_MEMORY_CACHE); - - if (data->gi == NULL) - FatalError("Error opening database %s\n",geoIP_path); + if(geoIP_path){ + data->gi = GeoIP_open(geoIP_path, GEOIP_MEMORY_CACHE); + + if (data->gi == NULL) + FatalError("alert_json: Error opening database %s\n",geoIP_path); + else + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: Success opening geoip database: %s\n", geoIP_path);); + }else{ + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: No geoip database specified.\n");); + } #endif // JSON_GEO_IP @@ -486,6 +498,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) free(kafka_server); } if ( filename ) free(filename); + if (geoIP_path) free(geoIP_path); return data; } @@ -894,12 +907,14 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogJSON_a(kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->human_readable_str:"0.0.0.0/0"); #ifdef JSON_GEO_IP - const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); - const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_COUNTRY_NAME,country_name?country_name:"N/A"); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); + if(jsonData->gi){ + const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); + const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_COUNTRY_NAME,country_name?country_name:"N/A"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRC_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); + } #endif } else if(!strncasecmp("dst", type, 3)) @@ -939,12 +954,14 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogJSON_a(kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->human_readable_str:"0.0.0.0/0"); #ifdef JSON_GEO_IP - const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); - const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_COUNTRY_NAME,country_name?country_name:"N/A"); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); + if(jsonData->gi){ + const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); + const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_COUNTRY_NAME,country_name?country_name:"N/A"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_DST_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); + } #endif } else if(!strncasecmp("icmptype",type,8)) From 44ad609446fec6a0c2ae2a4428a10a0debe4289a Mon Sep 17 00:00:00 2001 From: eugenio Date: Wed, 10 Jul 2013 10:00:32 +0000 Subject: [PATCH 043/198] Readed services and protocols file, and sended in the event --- src/output-plugins/spo_alert_json.c | 245 +++++++++++++++------------- 1 file changed, 131 insertions(+), 114 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index dc7258c..308731c 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -107,6 +107,7 @@ #define DEFAULT_CLASSIFICATION 0 #define JSON_MSG_NAME "msg" #define JSON_PROTO_NAME "proto" +#define JSON_PROTO_ID_NAME "proto_id" #define JSON_ETHSRC_NAME "ethsrc" #define JSON_ETHDST_NAME "ethdst" #define JSON_ETHTYPE_NAME "ethtype" @@ -115,6 +116,8 @@ #define JSON_TRHEADER_NAME "trheader" #define JSON_SRCPORT_NAME "srcport" #define JSON_DSTPORT_NAME "dstport" +#define JSON_SRCPORT_NAME_NAME "srcport_name" +#define JSON_DSTPORT_NAME_NAME "dstport_name" #define JSON_SRC_NAME "src" #define JSON_SRC_STR_NAME "src_str" #define JSON_SRC_NAME_NAME "src_name" @@ -154,12 +157,24 @@ typedef struct _AlertJSONConfig struct _AlertJSONConfig *next; } AlertJSONConfig; -typedef struct _IP_str_assoc{ +// @todo pass to a separate file +typedef struct _Number_str_assoc{ char * human_readable_str; char * number_as_str; - sfip_t ip; - struct _IP_str_assoc * next; -} IP_str_assoc; + union{sfip_t ip;uint16_t service;uint16_t protocol;} number; + struct _Number_str_assoc * next; +} Number_str_assoc; + +void freeNumberStrAssocList(Number_str_assoc * nstrList){ + Number_str_assoc * aux=nstrList,*aux2; + while(aux){ + aux2 = aux->next; + free(aux->human_readable_str); + free(aux->number_as_str); + free(aux); + aux=aux2; + } +}; typedef struct _AlertJSONData { @@ -168,7 +183,7 @@ typedef struct _AlertJSONData char ** args; int numargs; AlertJSONConfig *config; - IP_str_assoc * hosts, *nets; + Number_str_assoc * hosts, *nets, *services, *protocols; uint64_t sensor_id; char * sensor_name; #ifdef JSON_GEO_IP @@ -248,48 +263,40 @@ typedef enum{HOSTS,NETWORKS,SERVICES,PROTOCOLS} FILLHOSTSLIST_MODE; /* * @TODO put in a separate file */ -static IP_str_assoc * FillHostList_Host(char *line_buffer){ - /* Assuming format of /etc/hosts: ip hostname */ - char ** toks=NULL; - int num_toks; - IP_str_assoc * node = SnortAlloc(sizeof(IP_str_assoc)); - if(node){ - toks = mSplit((char *)line_buffer, " \t", 2, &num_toks, '\\'); - node->number_as_str = SnortStrdup(toks[0]); - node->human_readable_str = SnortStrdup(toks[1]); - const SFIP_RET ret = sfip_pton(node->number_as_str, &node->ip); - if(ret==SFIP_FAILURE){ - free(node->number_as_str); - free(node->human_readable_str); - free(node); - node=NULL; - } - mSplitFree(&toks, num_toks); - } - return node; -} - -/* - * @TODO put in a separate file - * @TODO same as FillHostList_Host except for node->number_as_str and human_readable_str order. merge? - */ -static IP_str_assoc * FillHostList_Net(char *line_buffer){ +static Number_str_assoc * FillHostList_Node(char *line_buffer, FILLHOSTSLIST_MODE mode){ /* Assuming format of /etc/hosts: ip hostname */ + /* Assuming format of /etc/networks: netname ip/mask */ + /* Assuming format of /etc/services: servicename number */ + /* Assuming format of /etc/protocols: protocolname number */ char ** toks=NULL; int num_toks; - IP_str_assoc * node = SnortAlloc(sizeof(IP_str_assoc)); + Number_str_assoc * node = SnortAlloc(sizeof(Number_str_assoc)); if(node){ - toks = mSplit((char *)line_buffer, " \t", 2, &num_toks, '\\'); - node->number_as_str = SnortStrdup(toks[1]); - node->human_readable_str = SnortStrdup(toks[0]); - const SFIP_RET ret = sfip_pton(node->number_as_str, &node->ip); - if(ret==SFIP_FAILURE){ - free(node->number_as_str); - free(node->human_readable_str); - free(node); - node=NULL; + if((toks = mSplit((char *)line_buffer, " \t", 2, &num_toks, '\\'))){ + node->number_as_str = SnortStrdup(mode==HOSTS?toks[0]:toks[1]); + node->human_readable_str = SnortStrdup(mode==HOSTS?toks[1]:toks[0]); + switch(mode){ + case HOSTS: + case NETWORKS: + { + const SFIP_RET ret = sfip_pton(node->number_as_str, &node->number.ip); + if(ret==SFIP_FAILURE){ + free(node->number_as_str); + free(node->human_readable_str); + free(node); + node=NULL; + } + } + break; + case SERVICES: + node->number.protocol = atoi(node->number_as_str); + break; + case PROTOCOLS: + node->number.service = atoi(node->number_as_str); + break; + }; + mSplitFree(&toks, num_toks); } - mSplitFree(&toks, num_toks); } return node; } @@ -304,7 +311,7 @@ static IP_str_assoc * FillHostList_Net(char *line_buffer){ * list => list to fill * mode => See FILLHOSTSLIST_MODE */ -static void FillHostsList(const char * filename,IP_str_assoc ** list, const FILLHOSTSLIST_MODE mode){ +static void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOSTSLIST_MODE mode){ char line_buffer[1024]; FILE * file; int aok=1; @@ -314,21 +321,10 @@ static void FillHostsList(const char * filename,IP_str_assoc ** list, const FILL FatalError("fopen() alert file %s: %s\n",filename, strerror(errno)); } - IP_str_assoc ** llinst_iterator = list; + Number_str_assoc ** llinst_iterator = list; while(NULL != fgets(line_buffer,1024,file) && aok){ if(line_buffer[0]!='#' && line_buffer[0]!='\n'){ - IP_str_assoc * ip_str; - - switch(mode){ - case HOSTS: - ip_str = FillHostList_Host(line_buffer); break; - case NETWORKS: - ip_str = FillHostList_Net(line_buffer); break; - case PROTOCOLS: - /* @TODO ip_str = FillHostList_Proto(line_buffer); */break; - case SERVICES: - /* @TODO ip_str = FillHostList_Service(line_buffer); */break; - }; + Number_str_assoc * ip_str= FillHostList_Node(line_buffer,mode); if(ip_str==NULL) FatalError("alert_json: cannot parse '%s' line in '%s' file\n",line_buffer,filename); *llinst_iterator = ip_str; @@ -340,31 +336,34 @@ static void FillHostsList(const char * filename,IP_str_assoc ** list, const FILL fclose(file); } -IP_str_assoc * SearchStrIP(uint32_t ip,const IP_str_assoc *iplist){ - IP_str_assoc * node; - sfip_t ip_to_cmp; - const SFIP_RET ret = sfip_set_raw(&ip_to_cmp, &ip, AF_INET); - if(ret!=SFIP_SUCCESS) - FatalError("alert_json: Cannot create sfip to compare in line %lu",__LINE__); - - for(node = (IP_str_assoc *)iplist;node;node=node->next){ - if(sfip_equals(ip_to_cmp,node->ip)) - break; - } - return node; -} - -IP_str_assoc * SearchStrNet(uint32_t ip,const IP_str_assoc *iplist){ - IP_str_assoc * node; - sfip_t ip_to_cmp; - const SFIP_RET ret = sfip_set_raw(&ip_to_cmp, &ip, AF_INET); - if(ret!=SFIP_SUCCESS) - FatalError("alert_json: Cannot create sfip to compare in line %lu",__LINE__); - - for(node = (IP_str_assoc *)iplist;node;node=node->next){ - if(sfip_fast_cont4(&node->ip,&ip_to_cmp)) +Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *iplist,FILLHOSTSLIST_MODE mode){ + Number_str_assoc * node; + + switch (mode){ + case HOSTS: + case NETWORKS: + { + sfip_t ip_to_cmp; + const SFIP_RET ret = sfip_set_raw(&ip_to_cmp, &number, AF_INET); + if(ret!=SFIP_SUCCESS) + FatalError("alert_json: Cannot create sfip to compare in line %lu",__LINE__); + + for(node = (Number_str_assoc *)iplist;node;node=node->next){ + if(mode==HOSTS && sfip_equals(ip_to_cmp,node->number.ip)) + break; + else if(mode==NETWORKS && sfip_fast_cont4(&node->number.ip,&ip_to_cmp)) + break; + } + } + break; + case SERVICES: + case PROTOCOLS: + for(node=(Number_str_assoc *)iplist;node;node=node->next){ + if(node->number.service /* same as .protocol*/ == number) + break; + } break; - } + }; return node; } @@ -391,8 +390,8 @@ static AlertJSONData *AlertJSONParseArgs(char *args) int i; char* hostsListPath = NULL; char* networksPath = NULL; - char* services = NULL; - char* protocols = NULL; + char* servicesPath = NULL; + char* protocolsPath = NULL; #ifdef JSON_GEO_IP char * geoIP_path = NULL; #endif @@ -424,14 +423,14 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->sensor_name = SnortStrdup(tok+strlen("sensor_name=")); }else if(!strncasecmp(tok,"sensor_id=",strlen("sensor_id="))){ data->sensor_id = atol(tok + strlen("sensor_id=")); - }else if(!strncasecmp(tok,"hostsListPath=",strlen("hostsListPath="))){ - hostsListPath = SnortStrdup(tok+strlen("hostsListPath=")); - }else if(!strncasecmp(tok,"networksPath=",strlen("networksPath="))){ - networksPath = SnortStrdup(tok+strlen("networksPath=")); + }else if(!strncasecmp(tok,"hosts=",strlen("hosts="))){ + hostsListPath = SnortStrdup(tok+strlen("hosts=")); + }else if(!strncasecmp(tok,"networks=",strlen("networks="))){ + networksPath = SnortStrdup(tok+strlen("networks=")); }else if(!strncasecmp(tok,"services=",strlen("services="))){ - services = SnortStrdup(tok+strlen("services=")); + servicesPath = SnortStrdup(tok+strlen("services=")); }else if(!strncasecmp(tok,"protocols=",strlen("protocols="))){ - protocols = SnortStrdup(tok+strlen("protocols=")); + protocolsPath = SnortStrdup(tok+strlen("protocols=")); }else if(!strncasecmp(tok,"start_partition=",strlen("start_partition="))){ start_partition = end_partition = atol(tok+strlen("start_partition=")); }else if(!strncasecmp(tok,"end_partition=",strlen("end_partition="))){ @@ -451,6 +450,10 @@ static AlertJSONData *AlertJSONParseArgs(char *args) if ( !data->sensor_name ) data->sensor_name = SnortStrdup("-"); if ( !filename ) filename = ProcessFileOption(barnyard2_conf_for_parsing, DEFAULT_FILE); if ( !kafka_str ) kafka_str = SnortStrdup(DEFAULT_KAFKA_BROKER); + if(hostsListPath) FillHostsList(hostsListPath,&data->hosts,HOSTS); + if(networksPath) FillHostsList(networksPath,&data->nets,NETWORKS); + if(servicesPath) FillHostsList(servicesPath,&data->services,SERVICES); + if(protocolsPath) FillHostsList(protocolsPath,&data->protocols,PROTOCOLS); mSplitFree(&toks, num_toks); toks = mSplit(data->jsonargs, ",", 128, &num_toks, 0); @@ -458,8 +461,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->args = toks; data->numargs = num_toks; - FillHostsList("/etc/hosts",&data->hosts,HOSTS); - FillHostsList("/etc/networks",&data->nets,NETWORKS); #ifdef JSON_GEO_IP if(geoIP_path){ @@ -498,14 +499,21 @@ static AlertJSONData *AlertJSONParseArgs(char *args) free(kafka_server); } if ( filename ) free(filename); + if( kafka_str ) free (kafka_str); + if( hostsListPath ) free (hostsListPath); + if( networksPath ) free (networksPath); + if( servicesPath ) free (servicesPath); + if( protocolsPath ) free (protocolsPath); + #ifdef JSON_GEO_IP if (geoIP_path) free(geoIP_path); + #endif + return data; } static void AlertJSONCleanup(int signal, void *arg, const char* msg) { - IP_str_assoc * ip_node=NULL; AlertJSONData *data = (AlertJSONData *)arg; /* close alert file */ DEBUG_WRAP(DebugMessage(DEBUG_LOG,"%s\n", msg);); @@ -516,22 +524,11 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) if(data->kafka) KafkaLog_Term(data->kafka); free(data->jsonargs); - ip_node = data->hosts; - while(ip_node){ - IP_str_assoc * aux = ip_node->next; - free(ip_node->human_readable_str); - free(ip_node->number_as_str); - free(ip_node); - ip_node = aux; - } - ip_node = data->nets; - while(ip_node){ - IP_str_assoc * aux = ip_node->next; - free(ip_node->human_readable_str); - free(ip_node->number_as_str); - free(ip_node); - ip_node = aux; - } + freeNumberStrAssocList(data->hosts); + freeNumberStrAssocList(data->nets); + freeNumberStrAssocList(data->services); + freeNumberStrAssocList(data->protocols); + #ifdef JSON_GEO_IP GeoIP_delete(data->gi); @@ -619,7 +616,6 @@ char* _intoa(unsigned int addr, char* buf, u_short bufLen) { return(retStr); } - /* * Function: RealAlertJSON(Packet *, char *, FILE *, char *, numargs const int) * @@ -755,7 +751,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); if(IPH_IS_VALID(p)) { - + #if 0 switch (GET_IPH_PROTO(p)) { case IPPROTO_UDP: @@ -771,7 +767,14 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogJSON_a(kafka,JSON_PROTO_NAME,"-"); break; } + #endif + Number_str_assoc * service_name_asoc = SearchNumberStr(GET_IPH_PROTO(p),jsonData->protocols,PROTOCOLS); + LogJSON_i16(kafka,JSON_PROTO_ID_NAME,service_name_asoc?service_name_asoc->number.protocol:0); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_PROTO_NAME,service_name_asoc?service_name_asoc->human_readable_str:"-"); }else{ /* Always log something */ + LogJSON_i16(kafka,JSON_PROTO_ID_NAME,0); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(kafka,JSON_PROTO_NAME,"-"); } } @@ -842,10 +845,17 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { case IPPROTO_UDP: case IPPROTO_TCP: + { + Number_str_assoc * service_name_asoc = SearchNumberStr(p->sp,jsonData->services,SERVICES); LogJSON_i16(kafka,JSON_SRCPORT_NAME,p->sp); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRCPORT_NAME_NAME,service_name_asoc?service_name_asoc->human_readable_str:"-"); + } break; default: /* Always log something */ LogJSON_i16(kafka,JSON_SRCPORT_NAME,0); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRCPORT_NAME_NAME,"-"); break; } }else{ /* Always Log something */ @@ -861,9 +871,16 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, { case IPPROTO_UDP: case IPPROTO_TCP: - LogJSON_i16(kafka,JSON_DSTPORT_NAME,p->dp); + { + Number_str_assoc * service_name_asoc = SearchNumberStr(p->dp,jsonData->services,SERVICES); + LogJSON_i16(kafka,JSON_SRCPORT_NAME,p->dp); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_a(kafka,JSON_SRCPORT_NAME_NAME,service_name_asoc?service_name_asoc->human_readable_str:"-"); + } break; default: + LogJSON_a(kafka,JSON_SRCPORT_NAME_NAME,"-"); + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_i16(kafka,JSON_DSTPORT_NAME,0); break; } @@ -886,7 +903,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogJSON_i32(kafka,JSON_SRC_NAME,ipv4); char * ip_str=NULL,*ip_name=NULL; - IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); + Number_str_assoc * ip_str_node = SearchNumberStr(ipv4,jsonData->hosts,HOSTS); if(ip_str_node){ ip_str = ip_str_node->number_as_str; ip_name = ip_str_node->human_readable_str; @@ -900,7 +917,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogJSON_a(kafka,JSON_SRC_NAME_NAME,ip_name); // networks - IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); + Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(kafka,JSON_SRC_NET_NAME,ip_net?ip_net->number_as_str:"0.0.0.0/0"); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); @@ -933,7 +950,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogJSON_i32(kafka,JSON_DST_NAME,ipv4); char * ip_str=NULL,*ip_name=NULL; - IP_str_assoc * ip_str_node = SearchStrIP(ipv4,jsonData->hosts); + Number_str_assoc * ip_str_node = SearchNumberStr(ipv4,jsonData->hosts,HOSTS); if(ip_str_node){ ip_str = ip_str_node->number_as_str; ip_name = ip_str_node->human_readable_str; @@ -947,7 +964,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, LogJSON_a(kafka,JSON_DST_NAME_NAME,ip_name); // networks - IP_str_assoc * ip_net = SearchStrNet(ipv4,jsonData->nets); + Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(kafka,JSON_DST_NET_NAME,ip_net?ip_net->number_as_str:"0.0.0.0/0"); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); From 5a8741ddac5f69a9e3b870daf459902aa2108764 Mon Sep 17 00:00:00 2001 From: eugenio Date: Wed, 10 Jul 2013 10:24:16 +0000 Subject: [PATCH 044/198] FIX: dst port name was the same as src_port name. --- src/output-plugins/spo_alert_json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 308731c..4ec5801 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -875,11 +875,11 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, Number_str_assoc * service_name_asoc = SearchNumberStr(p->dp,jsonData->services,SERVICES); LogJSON_i16(kafka,JSON_SRCPORT_NAME,p->dp); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRCPORT_NAME_NAME,service_name_asoc?service_name_asoc->human_readable_str:"-"); + LogJSON_a(kafka,JSON_DSTPORT_NAME_NAME,service_name_asoc?service_name_asoc->human_readable_str:"-"); } break; default: - LogJSON_a(kafka,JSON_SRCPORT_NAME_NAME,"-"); + LogJSON_a(kafka,JSON_DSTPORT_NAME_NAME,"-"); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_i16(kafka,JSON_DSTPORT_NAME,0); break; From 05fcdc2ae98b039cfe07db1a9454601367298fb2 Mon Sep 17 00:00:00 2001 From: eugenio Date: Wed, 10 Jul 2013 11:15:36 +0000 Subject: [PATCH 045/198] FIX: Classification field now show the correct classification message --- src/output-plugins/spo_alert_json.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 4ec5801..641fba1 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -104,7 +104,7 @@ #define JSON_PRIORITY_NAME "priority" #define DEFAULT_PRIORITY 0 #define JSON_CLASSIFICATION_NAME "classification" -#define DEFAULT_CLASSIFICATION 0 +#define DEFAULT_CLASSIFICATION "-" #define JSON_MSG_NAME "msg" #define JSON_PROTO_NAME "proto" #define JSON_PROTO_ID_NAME "proto_id" @@ -720,11 +720,14 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); if(event != NULL) { - if(!LogJSON_i32(kafka,JSON_CLASSIFICATION_NAME, ntohl(((Unified2EventCommon *)event)->classification_id))) - FatalError("Not enough buffer space to escape msg string\n"); + uint32_t classification_id = ntohl(((Unified2EventCommon *)event)->classification_id); + ClassType *cn = ClassTypeLookupById(barnyard2_conf, classification_id); + if ( cn != NULL ) + LogJSON_a(kafka,JSON_CLASSIFICATION_NAME,cn->name); + else + LogJSON_a(kafka,JSON_CLASSIFICATION_NAME, DEFAULT_CLASSIFICATION); }else{ /* Always log something */ - if(!LogJSON_i32(kafka,JSON_PRIORITY_NAME, DEFAULT_CLASSIFICATION)) - FatalError("Not enough buffer space to escape msg string\n"); + LogJSON_a(kafka,JSON_CLASSIFICATION_NAME, DEFAULT_CLASSIFICATION); } } else if(!strncasecmp("msg", type, 3)) From aacf0d9e1c6395e42898c1870b991adf43ec251b Mon Sep 17 00:00:00 2001 From: eugenio Date: Wed, 10 Jul 2013 12:31:01 +0000 Subject: [PATCH 046/198] Created rbutil folder, where it will be all redborder utils. --- .gitignore | 1 + configure.in | 1 + src/Makefile.am | 5 +- src/output-plugins/Makefile.am | 2 +- src/output-plugins/spo_alert_json.c | 136 +------------- src/rbutil/Makefile.am | 7 + src/{sfutil/sf_kafka.c => rbutil/rb_kafka.c} | 2 +- src/{sfutil/sf_kafka.h => rbutil/rb_kafka.h} | 21 +-- src/rbutil/rb_numstrpair_list.c | 176 +++++++++++++++++++ src/rbutil/rb_numstrpair_list.h | 47 +++++ src/sfutil/Makefile.am | 1 - 11 files changed, 246 insertions(+), 153 deletions(-) create mode 100644 src/rbutil/Makefile.am rename src/{sfutil/sf_kafka.c => rbutil/rb_kafka.c} (99%) rename src/{sfutil/sf_kafka.h => rbutil/rb_kafka.h} (91%) create mode 100644 src/rbutil/rb_numstrpair_list.c create mode 100644 src/rbutil/rb_numstrpair_list.h diff --git a/.gitignore b/.gitignore index ca9a380..f2491cb 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ src/barnyard2 src/input-plugins/libspi.a src/output-plugins/libspo.a src/sfutil/libsfutil.a +src/rbutil/librbutil.a stamp-h1 diff --git a/configure.in b/configure.in index 883e6ff..78f360e 100644 --- a/configure.in +++ b/configure.in @@ -1176,6 +1176,7 @@ AC_CONFIG_FILES([ \ Makefile \ src/Makefile \ src/sfutil/Makefile \ +src/rbutil/Makefile \ src/input-plugins/Makefile \ src/output-plugins/Makefile \ etc/Makefile \ diff --git a/src/Makefile.am b/src/Makefile.am index 5e0242b..ad1e1a6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,8 +30,9 @@ util.c util.h barnyard2_LDADD = output-plugins/libspo.a \ input-plugins/libspi.a \ -sfutil/libsfutil.a +sfutil/libsfutil.a \ +rbutil/librbutil.a -SUBDIRS = sfutil output-plugins input-plugins +SUBDIRS = sfutil rbutil output-plugins input-plugins INCLUDES = -Isfutil diff --git a/src/output-plugins/Makefile.am b/src/output-plugins/Makefile.am index f8eeeca..069029f 100644 --- a/src/output-plugins/Makefile.am +++ b/src/output-plugins/Makefile.am @@ -26,4 +26,4 @@ spo_syslog_full.c spo_syslog.full.h \ spo_database.c spo_database.h \ spo_database_cache.c spo_database_cache.h -INCLUDES = -I.. -I ../sfutil +INCLUDES = -I.. -I ../sfutil -I../rbutil diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 641fba1..fad812e 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -66,11 +66,11 @@ #include "barnyard2.h" #include "sfutil/sf_textlog.h" -#include "sfutil/sf_kafka.h" +#include "rbutil/rb_kafka.h" +#include "rbutil/rb_numstrpair_list.h" #include "errno.h" #include "signal.h" #include "log_text.h" -#include "ipv6_port.h" #ifdef JSON_GEO_IP #include "GeoIP.h" @@ -157,25 +157,6 @@ typedef struct _AlertJSONConfig struct _AlertJSONConfig *next; } AlertJSONConfig; -// @todo pass to a separate file -typedef struct _Number_str_assoc{ - char * human_readable_str; - char * number_as_str; - union{sfip_t ip;uint16_t service;uint16_t protocol;} number; - struct _Number_str_assoc * next; -} Number_str_assoc; - -void freeNumberStrAssocList(Number_str_assoc * nstrList){ - Number_str_assoc * aux=nstrList,*aux2; - while(aux){ - aux2 = aux->next; - free(aux->human_readable_str); - free(aux->number_as_str); - free(aux); - aux=aux2; - } -}; - typedef struct _AlertJSONData { KafkaLog * kafka; @@ -254,119 +235,6 @@ static void AlertJSONInit(char *args) AddFuncToRestartList(AlertRestart, data); } - -/* Enumeration for FillHostList - * @TODO put in a separate file - */ -typedef enum{HOSTS,NETWORKS,SERVICES,PROTOCOLS} FILLHOSTSLIST_MODE; - -/* - * @TODO put in a separate file - */ -static Number_str_assoc * FillHostList_Node(char *line_buffer, FILLHOSTSLIST_MODE mode){ - /* Assuming format of /etc/hosts: ip hostname */ - /* Assuming format of /etc/networks: netname ip/mask */ - /* Assuming format of /etc/services: servicename number */ - /* Assuming format of /etc/protocols: protocolname number */ - char ** toks=NULL; - int num_toks; - Number_str_assoc * node = SnortAlloc(sizeof(Number_str_assoc)); - if(node){ - if((toks = mSplit((char *)line_buffer, " \t", 2, &num_toks, '\\'))){ - node->number_as_str = SnortStrdup(mode==HOSTS?toks[0]:toks[1]); - node->human_readable_str = SnortStrdup(mode==HOSTS?toks[1]:toks[0]); - switch(mode){ - case HOSTS: - case NETWORKS: - { - const SFIP_RET ret = sfip_pton(node->number_as_str, &node->number.ip); - if(ret==SFIP_FAILURE){ - free(node->number_as_str); - free(node->human_readable_str); - free(node); - node=NULL; - } - } - break; - case SERVICES: - node->number.protocol = atoi(node->number_as_str); - break; - case PROTOCOLS: - node->number.service = atoi(node->number_as_str); - break; - }; - mSplitFree(&toks, num_toks); - } - } - return node; -} - -/* - * Function FillHostsList - * - * Purpose: Fill a host/net -> ip assotiation list from a hosts or network file - * (the format is the same as /etc/hosts and /etc/network) - * - * Arguments: filename => route to host/networks file - * list => list to fill - * mode => See FILLHOSTSLIST_MODE - */ -static void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOSTSLIST_MODE mode){ - char line_buffer[1024]; - FILE * file; - int aok=1; - - if((file = fopen(filename, "r")) == NULL) - { - FatalError("fopen() alert file %s: %s\n",filename, strerror(errno)); - } - - Number_str_assoc ** llinst_iterator = list; - while(NULL != fgets(line_buffer,1024,file) && aok){ - if(line_buffer[0]!='#' && line_buffer[0]!='\n'){ - Number_str_assoc * ip_str= FillHostList_Node(line_buffer,mode); - if(ip_str==NULL) - FatalError("alert_json: cannot parse '%s' line in '%s' file\n",line_buffer,filename); - *llinst_iterator = ip_str; - llinst_iterator = &ip_str->next; - ip_str->next=NULL; - } - } - - fclose(file); -} - -Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *iplist,FILLHOSTSLIST_MODE mode){ - Number_str_assoc * node; - - switch (mode){ - case HOSTS: - case NETWORKS: - { - sfip_t ip_to_cmp; - const SFIP_RET ret = sfip_set_raw(&ip_to_cmp, &number, AF_INET); - if(ret!=SFIP_SUCCESS) - FatalError("alert_json: Cannot create sfip to compare in line %lu",__LINE__); - - for(node = (Number_str_assoc *)iplist;node;node=node->next){ - if(mode==HOSTS && sfip_equals(ip_to_cmp,node->number.ip)) - break; - else if(mode==NETWORKS && sfip_fast_cont4(&node->number.ip,&ip_to_cmp)) - break; - } - } - break; - case SERVICES: - case PROTOCOLS: - for(node=(Number_str_assoc *)iplist;node;node=node->next){ - if(node->number.service /* same as .protocol*/ == number) - break; - } - break; - }; - return node; -} - /* * Function: ParseJSONArgs(char *) * diff --git a/src/rbutil/Makefile.am b/src/rbutil/Makefile.am new file mode 100644 index 0000000..1b51e82 --- /dev/null +++ b/src/rbutil/Makefile.am @@ -0,0 +1,7 @@ +AUTOMAKE_OPTIONS=foreign no-dependencies + +noinst_LIBRARIES = librbutil.a + +librbutil_a_SOURCES = rb_kafka.c rb_kafka.h rb_numstrpair_list.h rb_numstrpair_list.c + +INCLUDES = -I.. -I../sfutil diff --git a/src/sfutil/sf_kafka.c b/src/rbutil/rb_kafka.c similarity index 99% rename from src/sfutil/sf_kafka.c rename to src/rbutil/rb_kafka.c index 10081e0..24bd331 100644 --- a/src/sfutil/sf_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -40,7 +40,7 @@ #include #include -#include "sf_kafka.h" +#include "rb_kafka.h" #include "log.h" #include "util.h" diff --git a/src/sfutil/sf_kafka.h b/src/rbutil/rb_kafka.h similarity index 91% rename from src/sfutil/sf_kafka.h rename to src/rbutil/rb_kafka.h index 6a90184..bb2d02b 100644 --- a/src/sfutil/sf_kafka.h +++ b/src/rbutil/rb_kafka.h @@ -22,7 +22,7 @@ ****************************************************************************/ /** - * @file sf_kafka.h + * @file rb_kafka.h * @author Eugenio Pérez * @date Wed May 29 2013 * @@ -30,30 +30,23 @@ * Based on sf_text source. * * Declares a KafkaLog_*() api for buffered logging and send to an Apache Kafka - * Server. This allows unify the way to write json in a file and sending to - * kafka using TextLog_sf. + * Server. This allows unify the way to write json in a file using TextLog_sf and + * sending it to kafka. */ -#ifndef _SF_KAFKA_LOG_H -#define _SF_KAFKA_LOG_H +#ifndef _RB_KAFKA_LOG_H +#define _RB_KAFKA_LOG_H #include #include #include #include "debug.h" /* for INLINE */ -#include "sf_textlog.h" +#include "sfutil/sf_textlog.h" #ifdef JSON_KAFKA #include "librdkafka/rdkafka.h" #endif - -#include -#include -#include - -#include "debug.h" /* for INLINE */ - #ifndef _SF_TEXT_LOG_H // already defined in typedef int bool; #define TRUE 1 @@ -147,5 +140,5 @@ static INLINE bool KafkaLog_Puts (KafkaLog* this, const char* str) return KafkaLog_Write(this, str, strlen(str)); } -#endif /* _SF_KAFKA_LOG_H */ +#endif /* _RB_KAFKA_LOG_H */ diff --git a/src/rbutil/rb_numstrpair_list.c b/src/rbutil/rb_numstrpair_list.c new file mode 100644 index 0000000..1fb0359 --- /dev/null +++ b/src/rbutil/rb_numstrpair_list.c @@ -0,0 +1,176 @@ +/**************************************************************************** + * + * Copyright (C) 2013 Eneo Tecnologia S.L. + * Author: Eugenio Perez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License Version 2 as + * published by the Free Software Foundation. You may not use, modify or + * distribute this program under any other version of the GNU General + * Public License. + * + * 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. + * + ****************************************************************************/ + +/** + * @file rb_numstrpair_list.c + * @author Eugenio Pérez + * @date Wed May 29 2013 + * + * @brief Implements rb_numstrpair_list.h functions + */ + +#include +#include +#include "rb_numstrpair_list.h" +#include "barnyard2.h" +#include "util.h" +#include "mstring.h" + + +/* + * Function freeNumberStrAssocList + * + * Purpose: Extract a node from a line in the file. + * + * Arguments: number => nstrList: List to free. + */ +void freeNumberStrAssocList(Number_str_assoc * nstrList){ + Number_str_assoc * aux=nstrList,*aux2; + while(aux){ + aux2 = aux->next; + free(aux->human_readable_str); + free(aux->number_as_str); + free(aux); + aux=aux2; + } +}; + +/* + * Function FillHostList_Node + * + * Purpose: Extract a node from a line in the file. + * + * Arguments: number => line_buffer: line of the node in the text file + * mode => See FILLHOSTSLIST_MODE + */ +static Number_str_assoc * FillHostList_Node(char *line_buffer, FILLHOSTSLIST_MODE mode){ + /* Assuming format of /etc/hosts: ip hostname */ + /* Assuming format of /etc/networks: netname ip/mask */ + /* Assuming format of /etc/services: servicename number */ + /* Assuming format of /etc/protocols: protocolname number */ + char ** toks=NULL; + int num_toks; + Number_str_assoc * node = SnortAlloc(sizeof(Number_str_assoc)); + if(node){ + if((toks = mSplit((char *)line_buffer, " \t", 2, &num_toks, '\\'))){ + node->number_as_str = SnortStrdup(mode==HOSTS?toks[0]:toks[1]); + node->human_readable_str = SnortStrdup(mode==HOSTS?toks[1]:toks[0]); + switch(mode){ + case HOSTS: + case NETWORKS: + { + const SFIP_RET ret = sfip_pton(node->number_as_str, &node->number.ip); + if(ret==SFIP_FAILURE){ + free(node->number_as_str); + free(node->human_readable_str); + free(node); + node=NULL; + } + } + break; + case SERVICES: + node->number.protocol = atoi(node->number_as_str); + break; + case PROTOCOLS: + node->number.service = atoi(node->number_as_str); + break; + }; + mSplitFree(&toks, num_toks); + } + } + return node; +} + +/* + * Function FillHostsList + * + * Purpose: Fill a host/net -> ip assotiation list from a hosts or network file + * (the format is the same as /etc/hosts and /etc/network) + * + * Arguments: filename => route to host/networks file + * list => list to fill + * mode => See FILLHOSTSLIST_MODE + */ +void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOSTSLIST_MODE mode){ + char line_buffer[1024]; + FILE * file; + int aok=1; + + if((file = fopen(filename, "r")) == NULL) + { + FatalError("fopen() alert file %s: %s\n",filename, strerror(errno)); + } + + Number_str_assoc ** llinst_iterator = list; + while(NULL != fgets(line_buffer,1024,file) && aok){ + if(line_buffer[0]!='#' && line_buffer[0]!='\n'){ + Number_str_assoc * ip_str= FillHostList_Node(line_buffer,mode); + if(ip_str==NULL) + FatalError("alert_json: cannot parse '%s' line in '%s' file\n",line_buffer,filename); + *llinst_iterator = ip_str; + llinst_iterator = &ip_str->next; + ip_str->next=NULL; + } + } + + fclose(file); +} + +/* + * Function SearchNumberStr + * + * Purpose: Find a number in the list and return the associated node. + * + * Arguments: number => number to search + * list => list to search in + * mode => See FILLHOSTSLIST_MODE + */ +Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *iplist,FILLHOSTSLIST_MODE mode){ + Number_str_assoc * node; + + switch (mode){ + case HOSTS: + case NETWORKS: + { + sfip_t ip_to_cmp; + const SFIP_RET ret = sfip_set_raw(&ip_to_cmp, &number, AF_INET); + if(ret!=SFIP_SUCCESS) + FatalError("alert_json: Cannot create sfip to compare in line %lu",__LINE__); + + for(node = (Number_str_assoc *)iplist;node;node=node->next){ + if(mode==HOSTS && sfip_equals(ip_to_cmp,node->number.ip)) + break; + else if(mode==NETWORKS && sfip_fast_cont4(&node->number.ip,&ip_to_cmp)) + break; + } + } + break; + case SERVICES: + case PROTOCOLS: + for(node=(Number_str_assoc *)iplist;node;node=node->next){ + if(node->number.service /* same as .protocol*/ == number) + break; + } + break; + }; + return node; +} \ No newline at end of file diff --git a/src/rbutil/rb_numstrpair_list.h b/src/rbutil/rb_numstrpair_list.h new file mode 100644 index 0000000..0f3c353 --- /dev/null +++ b/src/rbutil/rb_numstrpair_list.h @@ -0,0 +1,47 @@ +/**************************************************************************** + * + * Copyright (C) 2013 Eneo Tecnologia S.L. + * Author: Eugenio Perez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License Version 2 as + * published by the Free Software Foundation. You may not use, modify or + * distribute this program under any other version of the GNU General + * Public License. + * + * 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. + * + ****************************************************************************/ + +/** + * @file rb_numstrpair_list.h + * @author Eugenio Pérez + * @date Wed May 29 2013 + * + * @brief Declares a linked list to save a number -> str association. Useful to + * save hostname -> hostip or service_name->service_number pairs. + */ + +#include "sf_ip.h" + +typedef struct _Number_str_assoc{ + char * human_readable_str; + char * number_as_str; + union{sfip_t ip;uint16_t service;uint16_t protocol;} number; + struct _Number_str_assoc * next; +} Number_str_assoc; + +/* Enumeration for FillHostList + */ +typedef enum{HOSTS,NETWORKS,SERVICES,PROTOCOLS} FILLHOSTSLIST_MODE; + +void freeNumberStrAssocList(Number_str_assoc * nstrList); +void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOSTSLIST_MODE mode); +Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *iplist,FILLHOSTSLIST_MODE mode); \ No newline at end of file diff --git a/src/sfutil/Makefile.am b/src/sfutil/Makefile.am index 5ad1b68..1171e29 100644 --- a/src/sfutil/Makefile.am +++ b/src/sfutil/Makefile.am @@ -12,7 +12,6 @@ libsfutil_a_SOURCES = bitop.h \ sf_iph.c sf_iph.h \ sf_ipvar.c sf_ipvar.h \ sf_textlog.c sf_textlog.h \ - sf_kafka.c sf_kafka.h \ sf_vartable.c sf_vartable.h From 7e2eda90ec7ec7fbfa449d25f5d4264a2acbe3a6 Mon Sep 17 00:00:00 2001 From: eugenio Date: Wed, 10 Jul 2013 12:31:01 +0000 Subject: [PATCH 047/198] Created rbutil folder, where it will be all redborder utils. --- .gitignore | 1 + configure.in | 1 + src/Makefile.am | 5 +- src/output-plugins/Makefile.am | 2 +- src/output-plugins/spo_alert_json.c | 136 +------------- src/rbutil/Makefile.am | 7 + src/{sfutil/sf_kafka.c => rbutil/rb_kafka.c} | 2 +- src/{sfutil/sf_kafka.h => rbutil/rb_kafka.h} | 21 +-- src/rbutil/rb_numstrpair_list.c | 176 +++++++++++++++++++ src/rbutil/rb_numstrpair_list.h | 47 +++++ src/sfutil/Makefile.am | 1 - 11 files changed, 246 insertions(+), 153 deletions(-) create mode 100644 src/rbutil/Makefile.am rename src/{sfutil/sf_kafka.c => rbutil/rb_kafka.c} (99%) rename src/{sfutil/sf_kafka.h => rbutil/rb_kafka.h} (91%) create mode 100644 src/rbutil/rb_numstrpair_list.c create mode 100644 src/rbutil/rb_numstrpair_list.h diff --git a/.gitignore b/.gitignore index ca9a380..f2491cb 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ src/barnyard2 src/input-plugins/libspi.a src/output-plugins/libspo.a src/sfutil/libsfutil.a +src/rbutil/librbutil.a stamp-h1 diff --git a/configure.in b/configure.in index 883e6ff..78f360e 100644 --- a/configure.in +++ b/configure.in @@ -1176,6 +1176,7 @@ AC_CONFIG_FILES([ \ Makefile \ src/Makefile \ src/sfutil/Makefile \ +src/rbutil/Makefile \ src/input-plugins/Makefile \ src/output-plugins/Makefile \ etc/Makefile \ diff --git a/src/Makefile.am b/src/Makefile.am index 5e0242b..6d2b4de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,8 +30,9 @@ util.c util.h barnyard2_LDADD = output-plugins/libspo.a \ input-plugins/libspi.a \ -sfutil/libsfutil.a +sfutil/libsfutil.a \ +rbutil/librbutil.a -SUBDIRS = sfutil output-plugins input-plugins +SUBDIRS = sfutil rbutil output-plugins input-plugins INCLUDES = -Isfutil diff --git a/src/output-plugins/Makefile.am b/src/output-plugins/Makefile.am index f8eeeca..069029f 100644 --- a/src/output-plugins/Makefile.am +++ b/src/output-plugins/Makefile.am @@ -26,4 +26,4 @@ spo_syslog_full.c spo_syslog.full.h \ spo_database.c spo_database.h \ spo_database_cache.c spo_database_cache.h -INCLUDES = -I.. -I ../sfutil +INCLUDES = -I.. -I ../sfutil -I../rbutil diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 641fba1..fad812e 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -66,11 +66,11 @@ #include "barnyard2.h" #include "sfutil/sf_textlog.h" -#include "sfutil/sf_kafka.h" +#include "rbutil/rb_kafka.h" +#include "rbutil/rb_numstrpair_list.h" #include "errno.h" #include "signal.h" #include "log_text.h" -#include "ipv6_port.h" #ifdef JSON_GEO_IP #include "GeoIP.h" @@ -157,25 +157,6 @@ typedef struct _AlertJSONConfig struct _AlertJSONConfig *next; } AlertJSONConfig; -// @todo pass to a separate file -typedef struct _Number_str_assoc{ - char * human_readable_str; - char * number_as_str; - union{sfip_t ip;uint16_t service;uint16_t protocol;} number; - struct _Number_str_assoc * next; -} Number_str_assoc; - -void freeNumberStrAssocList(Number_str_assoc * nstrList){ - Number_str_assoc * aux=nstrList,*aux2; - while(aux){ - aux2 = aux->next; - free(aux->human_readable_str); - free(aux->number_as_str); - free(aux); - aux=aux2; - } -}; - typedef struct _AlertJSONData { KafkaLog * kafka; @@ -254,119 +235,6 @@ static void AlertJSONInit(char *args) AddFuncToRestartList(AlertRestart, data); } - -/* Enumeration for FillHostList - * @TODO put in a separate file - */ -typedef enum{HOSTS,NETWORKS,SERVICES,PROTOCOLS} FILLHOSTSLIST_MODE; - -/* - * @TODO put in a separate file - */ -static Number_str_assoc * FillHostList_Node(char *line_buffer, FILLHOSTSLIST_MODE mode){ - /* Assuming format of /etc/hosts: ip hostname */ - /* Assuming format of /etc/networks: netname ip/mask */ - /* Assuming format of /etc/services: servicename number */ - /* Assuming format of /etc/protocols: protocolname number */ - char ** toks=NULL; - int num_toks; - Number_str_assoc * node = SnortAlloc(sizeof(Number_str_assoc)); - if(node){ - if((toks = mSplit((char *)line_buffer, " \t", 2, &num_toks, '\\'))){ - node->number_as_str = SnortStrdup(mode==HOSTS?toks[0]:toks[1]); - node->human_readable_str = SnortStrdup(mode==HOSTS?toks[1]:toks[0]); - switch(mode){ - case HOSTS: - case NETWORKS: - { - const SFIP_RET ret = sfip_pton(node->number_as_str, &node->number.ip); - if(ret==SFIP_FAILURE){ - free(node->number_as_str); - free(node->human_readable_str); - free(node); - node=NULL; - } - } - break; - case SERVICES: - node->number.protocol = atoi(node->number_as_str); - break; - case PROTOCOLS: - node->number.service = atoi(node->number_as_str); - break; - }; - mSplitFree(&toks, num_toks); - } - } - return node; -} - -/* - * Function FillHostsList - * - * Purpose: Fill a host/net -> ip assotiation list from a hosts or network file - * (the format is the same as /etc/hosts and /etc/network) - * - * Arguments: filename => route to host/networks file - * list => list to fill - * mode => See FILLHOSTSLIST_MODE - */ -static void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOSTSLIST_MODE mode){ - char line_buffer[1024]; - FILE * file; - int aok=1; - - if((file = fopen(filename, "r")) == NULL) - { - FatalError("fopen() alert file %s: %s\n",filename, strerror(errno)); - } - - Number_str_assoc ** llinst_iterator = list; - while(NULL != fgets(line_buffer,1024,file) && aok){ - if(line_buffer[0]!='#' && line_buffer[0]!='\n'){ - Number_str_assoc * ip_str= FillHostList_Node(line_buffer,mode); - if(ip_str==NULL) - FatalError("alert_json: cannot parse '%s' line in '%s' file\n",line_buffer,filename); - *llinst_iterator = ip_str; - llinst_iterator = &ip_str->next; - ip_str->next=NULL; - } - } - - fclose(file); -} - -Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *iplist,FILLHOSTSLIST_MODE mode){ - Number_str_assoc * node; - - switch (mode){ - case HOSTS: - case NETWORKS: - { - sfip_t ip_to_cmp; - const SFIP_RET ret = sfip_set_raw(&ip_to_cmp, &number, AF_INET); - if(ret!=SFIP_SUCCESS) - FatalError("alert_json: Cannot create sfip to compare in line %lu",__LINE__); - - for(node = (Number_str_assoc *)iplist;node;node=node->next){ - if(mode==HOSTS && sfip_equals(ip_to_cmp,node->number.ip)) - break; - else if(mode==NETWORKS && sfip_fast_cont4(&node->number.ip,&ip_to_cmp)) - break; - } - } - break; - case SERVICES: - case PROTOCOLS: - for(node=(Number_str_assoc *)iplist;node;node=node->next){ - if(node->number.service /* same as .protocol*/ == number) - break; - } - break; - }; - return node; -} - /* * Function: ParseJSONArgs(char *) * diff --git a/src/rbutil/Makefile.am b/src/rbutil/Makefile.am new file mode 100644 index 0000000..1b51e82 --- /dev/null +++ b/src/rbutil/Makefile.am @@ -0,0 +1,7 @@ +AUTOMAKE_OPTIONS=foreign no-dependencies + +noinst_LIBRARIES = librbutil.a + +librbutil_a_SOURCES = rb_kafka.c rb_kafka.h rb_numstrpair_list.h rb_numstrpair_list.c + +INCLUDES = -I.. -I../sfutil diff --git a/src/sfutil/sf_kafka.c b/src/rbutil/rb_kafka.c similarity index 99% rename from src/sfutil/sf_kafka.c rename to src/rbutil/rb_kafka.c index 10081e0..24bd331 100644 --- a/src/sfutil/sf_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -40,7 +40,7 @@ #include #include -#include "sf_kafka.h" +#include "rb_kafka.h" #include "log.h" #include "util.h" diff --git a/src/sfutil/sf_kafka.h b/src/rbutil/rb_kafka.h similarity index 91% rename from src/sfutil/sf_kafka.h rename to src/rbutil/rb_kafka.h index 6a90184..bb2d02b 100644 --- a/src/sfutil/sf_kafka.h +++ b/src/rbutil/rb_kafka.h @@ -22,7 +22,7 @@ ****************************************************************************/ /** - * @file sf_kafka.h + * @file rb_kafka.h * @author Eugenio Pérez * @date Wed May 29 2013 * @@ -30,30 +30,23 @@ * Based on sf_text source. * * Declares a KafkaLog_*() api for buffered logging and send to an Apache Kafka - * Server. This allows unify the way to write json in a file and sending to - * kafka using TextLog_sf. + * Server. This allows unify the way to write json in a file using TextLog_sf and + * sending it to kafka. */ -#ifndef _SF_KAFKA_LOG_H -#define _SF_KAFKA_LOG_H +#ifndef _RB_KAFKA_LOG_H +#define _RB_KAFKA_LOG_H #include #include #include #include "debug.h" /* for INLINE */ -#include "sf_textlog.h" +#include "sfutil/sf_textlog.h" #ifdef JSON_KAFKA #include "librdkafka/rdkafka.h" #endif - -#include -#include -#include - -#include "debug.h" /* for INLINE */ - #ifndef _SF_TEXT_LOG_H // already defined in typedef int bool; #define TRUE 1 @@ -147,5 +140,5 @@ static INLINE bool KafkaLog_Puts (KafkaLog* this, const char* str) return KafkaLog_Write(this, str, strlen(str)); } -#endif /* _SF_KAFKA_LOG_H */ +#endif /* _RB_KAFKA_LOG_H */ diff --git a/src/rbutil/rb_numstrpair_list.c b/src/rbutil/rb_numstrpair_list.c new file mode 100644 index 0000000..1fb0359 --- /dev/null +++ b/src/rbutil/rb_numstrpair_list.c @@ -0,0 +1,176 @@ +/**************************************************************************** + * + * Copyright (C) 2013 Eneo Tecnologia S.L. + * Author: Eugenio Perez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License Version 2 as + * published by the Free Software Foundation. You may not use, modify or + * distribute this program under any other version of the GNU General + * Public License. + * + * 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. + * + ****************************************************************************/ + +/** + * @file rb_numstrpair_list.c + * @author Eugenio Pérez + * @date Wed May 29 2013 + * + * @brief Implements rb_numstrpair_list.h functions + */ + +#include +#include +#include "rb_numstrpair_list.h" +#include "barnyard2.h" +#include "util.h" +#include "mstring.h" + + +/* + * Function freeNumberStrAssocList + * + * Purpose: Extract a node from a line in the file. + * + * Arguments: number => nstrList: List to free. + */ +void freeNumberStrAssocList(Number_str_assoc * nstrList){ + Number_str_assoc * aux=nstrList,*aux2; + while(aux){ + aux2 = aux->next; + free(aux->human_readable_str); + free(aux->number_as_str); + free(aux); + aux=aux2; + } +}; + +/* + * Function FillHostList_Node + * + * Purpose: Extract a node from a line in the file. + * + * Arguments: number => line_buffer: line of the node in the text file + * mode => See FILLHOSTSLIST_MODE + */ +static Number_str_assoc * FillHostList_Node(char *line_buffer, FILLHOSTSLIST_MODE mode){ + /* Assuming format of /etc/hosts: ip hostname */ + /* Assuming format of /etc/networks: netname ip/mask */ + /* Assuming format of /etc/services: servicename number */ + /* Assuming format of /etc/protocols: protocolname number */ + char ** toks=NULL; + int num_toks; + Number_str_assoc * node = SnortAlloc(sizeof(Number_str_assoc)); + if(node){ + if((toks = mSplit((char *)line_buffer, " \t", 2, &num_toks, '\\'))){ + node->number_as_str = SnortStrdup(mode==HOSTS?toks[0]:toks[1]); + node->human_readable_str = SnortStrdup(mode==HOSTS?toks[1]:toks[0]); + switch(mode){ + case HOSTS: + case NETWORKS: + { + const SFIP_RET ret = sfip_pton(node->number_as_str, &node->number.ip); + if(ret==SFIP_FAILURE){ + free(node->number_as_str); + free(node->human_readable_str); + free(node); + node=NULL; + } + } + break; + case SERVICES: + node->number.protocol = atoi(node->number_as_str); + break; + case PROTOCOLS: + node->number.service = atoi(node->number_as_str); + break; + }; + mSplitFree(&toks, num_toks); + } + } + return node; +} + +/* + * Function FillHostsList + * + * Purpose: Fill a host/net -> ip assotiation list from a hosts or network file + * (the format is the same as /etc/hosts and /etc/network) + * + * Arguments: filename => route to host/networks file + * list => list to fill + * mode => See FILLHOSTSLIST_MODE + */ +void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOSTSLIST_MODE mode){ + char line_buffer[1024]; + FILE * file; + int aok=1; + + if((file = fopen(filename, "r")) == NULL) + { + FatalError("fopen() alert file %s: %s\n",filename, strerror(errno)); + } + + Number_str_assoc ** llinst_iterator = list; + while(NULL != fgets(line_buffer,1024,file) && aok){ + if(line_buffer[0]!='#' && line_buffer[0]!='\n'){ + Number_str_assoc * ip_str= FillHostList_Node(line_buffer,mode); + if(ip_str==NULL) + FatalError("alert_json: cannot parse '%s' line in '%s' file\n",line_buffer,filename); + *llinst_iterator = ip_str; + llinst_iterator = &ip_str->next; + ip_str->next=NULL; + } + } + + fclose(file); +} + +/* + * Function SearchNumberStr + * + * Purpose: Find a number in the list and return the associated node. + * + * Arguments: number => number to search + * list => list to search in + * mode => See FILLHOSTSLIST_MODE + */ +Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *iplist,FILLHOSTSLIST_MODE mode){ + Number_str_assoc * node; + + switch (mode){ + case HOSTS: + case NETWORKS: + { + sfip_t ip_to_cmp; + const SFIP_RET ret = sfip_set_raw(&ip_to_cmp, &number, AF_INET); + if(ret!=SFIP_SUCCESS) + FatalError("alert_json: Cannot create sfip to compare in line %lu",__LINE__); + + for(node = (Number_str_assoc *)iplist;node;node=node->next){ + if(mode==HOSTS && sfip_equals(ip_to_cmp,node->number.ip)) + break; + else if(mode==NETWORKS && sfip_fast_cont4(&node->number.ip,&ip_to_cmp)) + break; + } + } + break; + case SERVICES: + case PROTOCOLS: + for(node=(Number_str_assoc *)iplist;node;node=node->next){ + if(node->number.service /* same as .protocol*/ == number) + break; + } + break; + }; + return node; +} \ No newline at end of file diff --git a/src/rbutil/rb_numstrpair_list.h b/src/rbutil/rb_numstrpair_list.h new file mode 100644 index 0000000..0f3c353 --- /dev/null +++ b/src/rbutil/rb_numstrpair_list.h @@ -0,0 +1,47 @@ +/**************************************************************************** + * + * Copyright (C) 2013 Eneo Tecnologia S.L. + * Author: Eugenio Perez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License Version 2 as + * published by the Free Software Foundation. You may not use, modify or + * distribute this program under any other version of the GNU General + * Public License. + * + * 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. + * + ****************************************************************************/ + +/** + * @file rb_numstrpair_list.h + * @author Eugenio Pérez + * @date Wed May 29 2013 + * + * @brief Declares a linked list to save a number -> str association. Useful to + * save hostname -> hostip or service_name->service_number pairs. + */ + +#include "sf_ip.h" + +typedef struct _Number_str_assoc{ + char * human_readable_str; + char * number_as_str; + union{sfip_t ip;uint16_t service;uint16_t protocol;} number; + struct _Number_str_assoc * next; +} Number_str_assoc; + +/* Enumeration for FillHostList + */ +typedef enum{HOSTS,NETWORKS,SERVICES,PROTOCOLS} FILLHOSTSLIST_MODE; + +void freeNumberStrAssocList(Number_str_assoc * nstrList); +void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOSTSLIST_MODE mode); +Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *iplist,FILLHOSTSLIST_MODE mode); \ No newline at end of file diff --git a/src/sfutil/Makefile.am b/src/sfutil/Makefile.am index 5ad1b68..1171e29 100644 --- a/src/sfutil/Makefile.am +++ b/src/sfutil/Makefile.am @@ -12,7 +12,6 @@ libsfutil_a_SOURCES = bitop.h \ sf_iph.c sf_iph.h \ sf_ipvar.c sf_ipvar.h \ sf_textlog.c sf_textlog.h \ - sf_kafka.c sf_kafka.h \ sf_vartable.c sf_vartable.h From dba7696c73a588d9e5c097c971c89f182d52fdda Mon Sep 17 00:00:00 2001 From: eugenio Date: Wed, 10 Jul 2013 12:41:45 +0000 Subject: [PATCH 048/198] Warning supressed. --- src/rbutil/rb_numstrpair_list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rbutil/rb_numstrpair_list.c b/src/rbutil/rb_numstrpair_list.c index 1fb0359..daa3102 100644 --- a/src/rbutil/rb_numstrpair_list.c +++ b/src/rbutil/rb_numstrpair_list.c @@ -145,7 +145,7 @@ void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOS * mode => See FILLHOSTSLIST_MODE */ Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *iplist,FILLHOSTSLIST_MODE mode){ - Number_str_assoc * node; + Number_str_assoc * node=NULL; switch (mode){ case HOSTS: From 8ac109003a7cc74a5ba1132fe0b13290608a9fb0 Mon Sep 17 00:00:00 2001 From: eugenio Date: Wed, 10 Jul 2013 13:13:41 +0000 Subject: [PATCH 049/198] Changed -DJSON_KAFKA and -DJSON_GEOIP to defines in config.h file --- configure.in | 16 ++++++---------- src/output-plugins/spo_alert_json.c | 28 ++++++++++++++-------------- src/rbutil/rb_kafka.c | 26 +++++++++++++------------- src/rbutil/rb_kafka.h | 11 ++++++----- src/rbutil/rb_numstrpair_list.c | 1 + 5 files changed, 40 insertions(+), 42 deletions(-) diff --git a/configure.in b/configure.in index 78f360e..ad15235 100644 --- a/configure.in +++ b/configure.in @@ -130,21 +130,17 @@ AC_ARG_ENABLE(geo-ip, enable_geo_ip="$enableval", enable_geop_ip="no") if test "x$enable_geo_ip" = "xyes"; then AC_MSG_RESULT(yes) - AC_CHECK_HEADERS([librdkafka/rdkafka.h],[], + AC_CHECK_HEADERS([GeoIP.h],[], [ - echo "Error: Librdkafka headers not found." - echo "You can download and install it from https://github.com/edenhill/librdkafka" - echo "Remember you have to use 0.7 branch" + echo "Error: MaxMind GeoIP headers not found." exit 1 ]) - AC_CHECK_LIB(rdkafka,rd_kafka_new,[], + AC_CHECK_LIB(GeoIP,GeoIP_open,[], [ - echo "Error: Librdkafka library not found." - echo "You can download and install it from https://github.com/edenhill/librdkafka" - echo "Remember you have to use 0.7 branch" + echo "Error: MaxMind GeoIP library not found." exit 1 ]) - CFLAGS="$CFLAGS -DJSON_GEO_IP" + AC_DEFINE_UNQUOTED([HAVE_GEOIP],[],[Have MaxMind GeoIP]) LDFLAGS="$LDFLAGS -lGeoIP" else AC_MSG_RESULT(no) @@ -169,7 +165,7 @@ if test "x$enable_kafka" = "xyes"; then echo "Remember you have to use 0.7 branch" exit 1 ]) - CFLAGS="$CFLAGS -DJSON_KAFKA" + AC_DEFINE([HAVE_RDKAFKA],[],[Have Apache Kafka library]) LDFLAGS="$LDFLAGS -lrdkafka" AC_MSG_RESULT(yes) else diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index fad812e..0499c6a 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -72,9 +72,9 @@ #include "signal.h" #include "log_text.h" -#ifdef JSON_GEO_IP +#ifdef HAVE_GEOIP #include "GeoIP.h" -#endif // JSON_GEO_IP +#endif // HAVE_GEOIP #define DEFAULT_JSON "timestamp,sensor_id,sig_generator,sig_id,sig_rev,priority,classification,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" @@ -143,12 +143,12 @@ #define JSON_TCPWINDOW_NAME "tcpwindow" #define JSON_TCPFLAGS_NAME "tcpflags" -#ifdef JSON_GEO_IP +#ifdef HAVE_GEOIP #define JSON_SRC_COUNTRY_NAME "src_country" #define JSON_DST_COUNTRY_NAME "dst_country" #define JSON_SRC_COUNTRY_CODE_NAME "src_country_code" #define JSON_DST_COUNTRY_CODE_NAME "dst_country_code" -#endif // JSON_GEO_IP +#endif // HAVE_GEOIP typedef struct _AlertJSONConfig @@ -167,7 +167,7 @@ typedef struct _AlertJSONData Number_str_assoc * hosts, *nets, *services, *protocols; uint64_t sensor_id; char * sensor_name; -#ifdef JSON_GEO_IP +#ifdef HAVE_GEOIP GeoIP *gi; #endif } AlertJSONData; @@ -260,7 +260,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) char* networksPath = NULL; char* servicesPath = NULL; char* protocolsPath = NULL; - #ifdef JSON_GEO_IP + #ifdef HAVE_GEOIP char * geoIP_path = NULL; #endif int start_partition=KAFKA_PARTITION,end_partition=KAFKA_PARTITION; @@ -303,10 +303,10 @@ static AlertJSONData *AlertJSONParseArgs(char *args) start_partition = end_partition = atol(tok+strlen("start_partition=")); }else if(!strncasecmp(tok,"end_partition=",strlen("end_partition="))){ end_partition = atol(tok+strlen("end_partition=")); - #ifdef JSON_GEO_IP + #ifdef HAVE_GEOIP }else if(!strncasecmp(tok,"geoip=",strlen("geoip="))){ geoIP_path = SnortStrdup(tok+strlen("geoip=")); - #endif // JSON_GEO_IP + #endif // HAVE_GEOIP }else{ FatalError("alert_json: Cannot parse %s(%i): %s\n", file_name, file_line, tok); @@ -330,7 +330,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->numargs = num_toks; -#ifdef JSON_GEO_IP +#ifdef HAVE_GEOIP if(geoIP_path){ data->gi = GeoIP_open(geoIP_path, GEOIP_MEMORY_CACHE); @@ -342,7 +342,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: No geoip database specified.\n");); } -#endif // JSON_GEO_IP +#endif // HAVE_GEOIP DEBUG_WRAP(DebugMessage( DEBUG_INIT, "alert_json: '%s' '%s'\n", filename, data->jsonargs @@ -372,7 +372,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) if( networksPath ) free (networksPath); if( servicesPath ) free (servicesPath); if( protocolsPath ) free (protocolsPath); - #ifdef JSON_GEO_IP + #ifdef HAVE_GEOIP if (geoIP_path) free(geoIP_path); #endif @@ -398,7 +398,7 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) freeNumberStrAssocList(data->protocols); - #ifdef JSON_GEO_IP + #ifdef HAVE_GEOIP GeoIP_delete(data->gi); #endif // GWO_IP /* free memory from SpoJSONData */ @@ -794,7 +794,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->human_readable_str:"0.0.0.0/0"); - #ifdef JSON_GEO_IP + #ifdef HAVE_GEOIP if(jsonData->gi){ const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); @@ -841,7 +841,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_a(kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->human_readable_str:"0.0.0.0/0"); - #ifdef JSON_GEO_IP + #ifdef HAVE_GEOIP if(jsonData->gi){ const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index 24bd331..483920b 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -56,7 +56,7 @@ * TextLog_Open/Close: open/close associated log file *------------------------------------------------------------------- */ -#ifdef JSON_KAFKA +#ifdef HAVE_LIBRDKAFKA rd_kafka_t* KafkaLog_Open (const char* name) { if ( !name ) return NULL; @@ -105,7 +105,7 @@ KafkaLog* KafkaLog_Init ( KafkaLog* this; this = (KafkaLog*)malloc(sizeof(KafkaLog)); - #ifdef JSON_KAFKA + #ifdef HAVE_LIBRDKAFKA if(this){ this->buf = malloc(sizeof(char)*maxBuf); @@ -143,7 +143,7 @@ void KafkaLog_Term (KafkaLog* this) if ( !this ) return; KafkaLog_Flush(this); - #ifdef JSON_KAFKA + #ifdef HAVE_LIBRDKAFKA KafkaLog_Close(this->handler); free(this->buf); @@ -161,7 +161,7 @@ void KafkaLog_Term (KafkaLog* this) */ bool KafkaLog_Flush(KafkaLog* this) { - #if JSON_KAFKA + #if HAVE_LIBRDKAFKA if ( !this->pos ) return FALSE; // In daemon mode, we must start the handler here @@ -194,14 +194,14 @@ bool KafkaLog_Flush(KafkaLog* this) */ bool KafkaLog_Putc (KafkaLog* this, char c) { - #ifdef JSON_KAFKA + #ifdef HAVE_LIBRDKAFKA if ( KafkaLog_Avail(this) < 1 ) { KafkaLog_Flush(this); } this->buf[this->pos++] = c; this->buf[this->pos] = '\0'; - #endif // JSON_KAFKA + #endif // HAVE_LIBRDKAFKA if(this->textLog) TextLog_Putc(this->textLog,c); return TRUE; @@ -213,7 +213,7 @@ bool KafkaLog_Putc (KafkaLog* this, char c) */ bool KafkaLog_Write (KafkaLog* this, const char* str, int len) { - #ifdef JSON_KAFKA + #ifdef HAVE_LIBRDKAFKA int avail = KafkaLog_Avail(this); if ( len >= avail ) @@ -235,7 +235,7 @@ bool KafkaLog_Write (KafkaLog* this, const char* str, int len) } this->pos += len; - #endif // JSON_KAFKA + #endif // HAVE_LIBRDKAFKA if(this->textLog) TextLog_Write(this->textLog,str,len); return TRUE; } @@ -249,19 +249,19 @@ bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) int avail = KafkaLog_Avail(this); int len; va_list ap; - #ifdef JSON_KAFKA + #ifdef HAVE_LIBRDKAFKA int currentLenght = this->maxBuf; #endif va_start(ap, fmt); - #ifdef JSON_KAFKA + #ifdef HAVE_LIBRDKAFKA len = vsnprintf(this->buf+this->pos, avail, fmt, ap); #endif if(this->textLog) vsnprintf(this->textLog->buf+this->textLog->pos, avail, fmt, ap); va_end(ap); - #ifdef JSON_KAFKA + #ifdef HAVE_LIBRDKAFKA while(len >= avail){ // Send a half json message to Kafka has no sense, so we will try to // increase the buffer's lenght to allocate the full message. @@ -300,7 +300,7 @@ bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) { // NOPE! return FALSE; } - #ifdef JSON_KAFKA + #ifdef HAVE_LIBRDKAFKA this->pos += len; #endif if(this->textLog) this->textLog->pos += len; @@ -315,7 +315,7 @@ bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) */ bool KafkaLog_Quote (KafkaLog* this, const char* qs) { - #ifdef JSON_KAFKA + #ifdef HAVE_LIBRDKAFKA int pos = this->pos; if ( KafkaLog_Avail(this) < 3 ) diff --git a/src/rbutil/rb_kafka.h b/src/rbutil/rb_kafka.h index bb2d02b..2c83ddc 100644 --- a/src/rbutil/rb_kafka.h +++ b/src/rbutil/rb_kafka.h @@ -41,9 +41,10 @@ #include #include +#include "config.h" #include "debug.h" /* for INLINE */ #include "sfutil/sf_textlog.h" -#ifdef JSON_KAFKA +#ifdef HAVE_LIBRDKAFKA #include "librdkafka/rdkafka.h" #endif @@ -66,7 +67,7 @@ typedef int bool; */ typedef struct _KafkaLog { -#ifdef JSON_KAFKA +#ifdef HAVE_LIBRDKAFKA /* private: */ /* broker attributes: */ rd_kafka_t * handler; @@ -104,7 +105,7 @@ bool KafkaLog_Flush(KafkaLog*); */ static INLINE int KafkaLog_Tell (KafkaLog* this) { - #ifndef JSON_KAFKA + #ifndef HAVE_LIBRDKAFKA return this->textLog?this->textLog->pos:0; #else return this->pos; @@ -113,7 +114,7 @@ bool KafkaLog_Flush(KafkaLog*); static INLINE int KafkaLog_Avail (KafkaLog* this) { - #ifndef JSON_KAFKA + #ifndef HAVE_LIBRDKAFKA return this->textLog?TextLog_Avail(this->textLog):0; #else return this->maxBuf - this->pos - 1; @@ -124,7 +125,7 @@ bool KafkaLog_Flush(KafkaLog*); { if(this->textLog) TextLog_Reset(this->textLog); - #ifdef JSON_KAFKA + #ifdef HAVE_LIBRDKAFKA this->pos = 0; this->buf[this->pos] = '\0'; #endif diff --git a/src/rbutil/rb_numstrpair_list.c b/src/rbutil/rb_numstrpair_list.c index daa3102..cdc762b 100644 --- a/src/rbutil/rb_numstrpair_list.c +++ b/src/rbutil/rb_numstrpair_list.c @@ -29,6 +29,7 @@ */ #include +#include #include #include "rb_numstrpair_list.h" #include "barnyard2.h" From 3f2a03a71fe2cc2a5d507fc0f60ff33c550c56d2 Mon Sep 17 00:00:00 2001 From: eugenio Date: Thu, 11 Jul 2013 09:06:26 +0000 Subject: [PATCH 050/198] Added payload field --- src/output-plugins/spo_alert_json.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 0499c6a..8ff2483 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,7 +77,7 @@ #endif // HAVE_GEOIP -#define DEFAULT_JSON "timestamp,sensor_id,sig_generator,sig_id,sig_rev,priority,classification,msg,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sensor_id,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" @@ -106,6 +106,7 @@ #define JSON_CLASSIFICATION_NAME "classification" #define DEFAULT_CLASSIFICATION "-" #define JSON_MSG_NAME "msg" +#define JSON_PAYLOAD_NAME "payload" #define JSON_PROTO_NAME "proto" #define JSON_PROTO_ID_NAME "proto_id" #define JSON_ETHSRC_NAME "ethsrc" @@ -617,6 +618,19 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, } } } + else if(!strncasecmp("payload", type, strlen("payload"))) + { + uint16_t i; + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + KafkaLog_Puts(kafka, "\""JSON_PAYLOAD_NAME"\":\""); + if(p && p->dsize>0){ + for(i=0;idsize;++i) + KafkaLog_Print(kafka, "%"PRIx8, p->data[i]); + }else{ + KafkaLog_Puts(kafka, "-"); + } + KafkaLog_Puts(kafka,"\""); + } else if(!strncasecmp("proto", type, 5)) { KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); @@ -979,6 +993,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, } KafkaLog_Putc(kafka,'}'); + // Just for debug + DEBUG_WRAP(DebugMessage(DEBUG_LOG,"[KAFKA]: %s",kafka->buf);); KafkaLog_Flush(kafka); } From 99adef9a9400aa651de87aed2f8fc27c4c05354f Mon Sep 17 00:00:00 2001 From: eugenio Date: Fri, 12 Jul 2013 09:22:22 +0000 Subject: [PATCH 051/198] Changed the strcmp alerts processing system to a template based one --- src/output-plugins/spo_alert_json.c | 780 ++++++++++++++++------------ 1 file changed, 446 insertions(+), 334 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 8ff2483..03a992a 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,7 +77,7 @@ #endif // HAVE_GEOIP -#define DEFAULT_JSON "timestamp,sensor_id,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,src,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcpln,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" @@ -107,8 +107,11 @@ #define DEFAULT_CLASSIFICATION "-" #define JSON_MSG_NAME "msg" #define JSON_PAYLOAD_NAME "payload" +#define DEFAULT_PAYLOAD "-" #define JSON_PROTO_NAME "proto" +#define DEFAULT_PROTO "-" #define JSON_PROTO_ID_NAME "proto_id" +#define DEFAULT_PROTO_ID 0 #define JSON_ETHSRC_NAME "ethsrc" #define JSON_ETHDST_NAME "ethdst" #define JSON_ETHTYPE_NAME "ethtype" @@ -151,9 +154,78 @@ #define JSON_DST_COUNTRY_CODE_NAME "dst_country_code" #endif // HAVE_GEOIP +#define TIMESTAMP 1 +#define SENSOR_ID_SNORT 2 +#define SENSOR_ID 3 +#define SENSOR_NAME 4 +#define SIG_GENERATOR 5 +#define SIG_ID 6 +#define SIG_REV 7 +#define PRIORITY 8 +#define CLASSIFICATION 9 +#define MSG 10 +#define PAYLOAD 11 +#define PROTO 12 +#define PROTO_ID 13 +#define ETHSRC 14 +#define ETHDST 15 +#define ETHTYPE 16 +#define UDPLENGTH 17 +#define ETHLENGTH 18 +#define TRHEADER 19 +#define SRCPORT 20 +#define DSTPORT 21 +#define SRCPORT_NAME 22 +#define DSTPORT_NAME 23 +#define SRC_TEMPLATE_ID 24 +#define SRC_STR 25 +#define SRC_NAME 26 +#define SRC_NET 27 +#define SRC_NET_NAME 28 +#define DST_TEMPLATE_ID 29 +#define DST_NAME 30 +#define DST_STR 31 +#define DST_NET 32 +#define DST_NET_NAME 33 +#define ICMPTYPE 34 +#define ICMPCODE 35 +#define ICMPID 36 +#define ICMPSEQ 37 +#define TTL 38 +#define TOS 39 +#define ID 40 +#define IPLEN 41 +#define DGMLEN 42 +#define TCPSEQ 43 +#define TCPACK 44 +#define TCPLEN 45 +#define TCPWINDOW 46 +#define TCPFLAGS 47 -typedef struct _AlertJSONConfig -{ +#ifdef HAVE_GEOIP +#define SRC_COUNTRY 48 +#define DST_COUNTRY 49 +#define SRC_COUNTRY_CODE 50 +#define DST_COUNTRY_CODE 51 +#endif // HAVE_GEOIP + +#define TEMPLATE_END_ID 52 /* Remember to update it if some template element is added */ + +typedef enum{stringFormat,numericFormat} JsonPrintFormat; + +typedef struct{ + const uint32_t id; + const char * templateName; + const char * jsonName; + const JsonPrintFormat printFormat; +} AlertJSONTemplateElement; + +typedef struct _TemplateElementsList{ + AlertJSONTemplateElement * templateElement; + struct _TemplateElementsList * next; +} TemplateElementsList; + +typedef struct _AlertJSONConfig{ char *type; struct _AlertJSONConfig *next; } AlertJSONConfig; @@ -162,8 +234,9 @@ typedef struct _AlertJSONData { KafkaLog * kafka; char * jsonargs; - char ** args; - int numargs; + char ** args; // @before commit this will be deleted. + int numargs; // same for this + TemplateElementsList * outputTemplate; AlertJSONConfig *config; Number_str_assoc * hosts, *nets, *services, *protocols; uint64_t sensor_id; @@ -173,6 +246,63 @@ typedef struct _AlertJSONData #endif } AlertJSONData; +/* Remember update printElementWithTemplate if some element modified here */ +static AlertJSONTemplateElement template[] = { + {TIMESTAMP,"timestamp","event_timestamp",numericFormat}, + {SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat}, + {SENSOR_ID,"sensor_id","sensor_id",numericFormat}, + {SENSOR_NAME,"sensor_name","sensor_name",stringFormat}, + {SIG_GENERATOR,"sig_generator","sig_generator",numericFormat}, + {SIG_ID,"sig_id","sig_id",numericFormat}, + {SIG_REV,"sig_rev","rev",numericFormat}, + {PRIORITY,"priority","priority",numericFormat}, + {CLASSIFICATION,"classification","classification",stringFormat}, + {MSG,"msg","msg",stringFormat}, + {PAYLOAD,"payload","payload",stringFormat}, + {PROTO,"proto","proto",stringFormat}, + {PROTO_ID,"proto_id","proto_id",numericFormat}, + {ETHSRC,"ethsrc","ethsrc",stringFormat}, + {ETHDST,"ethdst","ethdst",stringFormat}, + {ETHTYPE,"ethtype","ethtype",numericFormat}, + {UDPLENGTH,"udplength","udplength",numericFormat}, + {ETHLENGTH,"ethlen","ethlength",numericFormat}, + {TRHEADER,"trheader","trheader",stringFormat}, + {SRCPORT,"srcport","srcport",numericFormat}, + {SRCPORT_NAME,"srcport_name","srcport_name",stringFormat}, + {DSTPORT,"dstport","dstport",numericFormat}, + {DSTPORT_NAME,"dstport_name","dstport_name",stringFormat}, + {SRC_TEMPLATE_ID,"src","src",numericFormat}, + {SRC_STR,"src_str","src_str",stringFormat}, + {SRC_NAME,"src_name","src_name",stringFormat}, + {SRC_NET,"src_net","src_net",stringFormat}, + {SRC_NET_NAME,"src_net_name","src_net_name",stringFormat}, + {DST_TEMPLATE_ID,"dst","dst",numericFormat}, + {DST_NAME,"dst_name","dst_name",stringFormat}, + {DST_STR,"dst_str","dst_str",stringFormat}, + {DST_NET,"dst_net","dst_net",stringFormat}, + {DST_NET_NAME,"dst_net_name","dst_net_name",stringFormat}, + {ICMPTYPE,"icmptype","icmptype",numericFormat}, + {ICMPCODE,"icmpcode","icmpcode",numericFormat}, + {ICMPID,"icmpid","icmpid",numericFormat}, + {ICMPSEQ,"icmpseq","icmpseq",numericFormat}, + {TTL,"ttl","ttl",numericFormat}, + {TOS,"tos","tos",numericFormat}, + {ID,"id","id",numericFormat}, + {IPLEN,"iplen","iplen",numericFormat}, + {DGMLEN,"dgmlen","dgmlen",numericFormat}, + {TCPSEQ,"tcpseq","tcpseq",numericFormat}, + {TCPACK,"tcpack","tcpack",numericFormat}, + {TCPLEN,"tcplen","tcplen",numericFormat}, + {TCPWINDOW,"tcpwindow","tcpwindow",numericFormat}, + {TCPFLAGS,"tcpflags","tcpflags",stringFormat}, + #ifdef HAVE_GEOIP + {SRC_COUNTRY,"src_country","src_country",stringFormat}, + {DST_COUNTRY,"dst_country","dst_country",stringFormat}, + {SRC_COUNTRY_CODE,"src_country_code","src_country_code",stringFormat}, + {DST_COUNTRY_CODE,"dst_country_code","dst_country_code",stringFormat}, + #endif /* HAVE_GEOIP */ + {TEMPLATE_END_ID,"","",numericFormat} +}; /* list of function prototypes for this preprocessor */ static void AlertJSONInit(char *); @@ -327,8 +457,25 @@ static AlertJSONData *AlertJSONParseArgs(char *args) mSplitFree(&toks, num_toks); toks = mSplit(data->jsonargs, ",", 128, &num_toks, 0); - data->args = toks; - data->numargs = num_toks; + for(i=0;ioutputTemplate; + while(*templateIterator!=NULL) templateIterator=&(*templateIterator)->next; + *templateIterator = SnortAlloc(sizeof(TemplateElementsList)); + (*templateIterator)->templateElement = &template[j]; + break; + } + } + } + + data->args = NULL; + data->numargs = 0; + + mSplitFree(&toks, num_toks); #ifdef HAVE_GEOIP @@ -384,12 +531,12 @@ static AlertJSONData *AlertJSONParseArgs(char *args) static void AlertJSONCleanup(int signal, void *arg, const char* msg) { AlertJSONData *data = (AlertJSONData *)arg; + TemplateElementsList *iter,*aux; /* close alert file */ DEBUG_WRAP(DebugMessage(DEBUG_LOG,"%s\n", msg);); if(data) { - mSplitFree(&data->args, data->numargs); if(data->kafka) KafkaLog_Term(data->kafka); free(data->jsonargs); @@ -397,6 +544,10 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) freeNumberStrAssocList(data->nets); freeNumberStrAssocList(data->services); freeNumberStrAssocList(data->protocols); + for(iter=data->outputTemplate;iter;iter=aux){ + aux = iter->next; + free(iter); + } #ifdef HAVE_GEOIP @@ -486,7 +637,7 @@ char* _intoa(unsigned int addr, char* buf, u_short bufLen) { } /* - * Function: RealAlertJSON(Packet *, char *, FILE *, char *, numargs const int) + * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) * * Purpose: Write a user defined JSON message * @@ -498,95 +649,89 @@ char* _intoa(unsigned int addr, char* buf, u_short bufLen) { * Returns: void function * */ -static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, - char **args, int numargs, AlertJSONData * jsonData) -{ - int num; +static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement){ SigNode *sn; - char *type; char tcpFlags[9]; - + char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; + const size_t bufLen = sizeof buf; KafkaLog * kafka = jsonData->kafka; + uint32_t ipv4 = 0; + const int initial_buffer_pos = kafka->pos; + + /* Avoid repeated code */ + if(IPH_IS_VALID(p)){ + switch(templateElement->id){ + case SRC_TEMPLATE_ID: + case SRC_STR: + case SRC_NAME: + case SRC_NET: + case SRC_NET_NAME: +#ifdef HAVE_GEOIP + case SRC_COUNTRY: + case SRC_COUNTRY_CODE: +#endif + ipv4 = GET_SRC_ADDR(p).s_addr; + break; + + case DST_TEMPLATE_ID: + case DST_STR: + case DST_NAME: + case DST_NET: + case DST_NET_NAME: +#ifdef HAVE_GEOIP + case DST_COUNTRY: + case DST_COUNTRY_CODE: +#endif + ipv4 = GET_DST_ADDR(p).s_addr; + break; + }; + } - if(p == NULL) - return; + /* Printing name of field. At the moment, we don't use the template one.*/ + #if 0 + PrintJSONFieldName(kafka,templateElement->jsonName); + if(templateElement->printFormat == stringFormat) + KafkaLog_Putc('"'); + #endif - DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging JSON Alert data\n");); - KafkaLog_Putc(kafka,'{'); - for (num = 0; num < numargs; num++) - { - type = args[num]; - DEBUG_WRAP(DebugMessage(DEBUG_LOG, "JSON Got type %s %d\n", type, num);); - if(!strncasecmp("timestamp", type, 9)) - { - // LogOrKafka_Puts(log, kafka, JSON_FIELDS_SEPARATOR" "); // Commented cause timestamp will be the first always - if(!LogJSON_i64(kafka,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000)) - FatalError("Not enough buffer space to escape msg string\n"); - } - else if(!strncasecmp("sensor_id",type,sizeof "sensor_id")) - { - KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); + switch(templateElement->id){ + case TIMESTAMP: + LogJSON_i64(kafka,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000); + break; + case SENSOR_ID_SNORT: if(event != NULL) - { - if(!LogJSON_i32(kafka,JSON_SENSOR_ID_SNORT_NAME,ntohl(((Unified2EventCommon *)event)->sensor_id))) - FatalError("Not enough buffer space to escape msg string\n"); - }else{ - if(!LogJSON_i32(kafka,JSON_SENSOR_ID_SNORT_NAME,SENSOR_NOT_FOUND_NUMBER)) - FatalError("Not enough buffer space to escape msg string\n"); - } - - KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); - if(!LogJSON_i32(kafka,JSON_SENSOR_ID_NAME,jsonData->sensor_id)) - FatalError("Not enough buffer space to escape msg string\n"); - - KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); - if(!LogJSON_a(kafka,JSON_SENSOR_NAME_NAME,jsonData->sensor_name)) - FatalError("Not enough buffer space to escape msg string\n"); - - } - else if(!strncasecmp("sig_generator ",type,13)) - { + LogJSON_i32(kafka,JSON_SENSOR_ID_SNORT_NAME,ntohl(((Unified2EventCommon *)event)->sensor_id)); + else + LogJSON_i32(kafka,JSON_SENSOR_ID_SNORT_NAME,SENSOR_NOT_FOUND_NUMBER); + break; + case SENSOR_ID: + LogJSON_i32(kafka,JSON_SENSOR_ID_NAME,jsonData->sensor_id); + break; + + case SENSOR_NAME: + LogJSON_a(kafka,JSON_SENSOR_NAME_NAME,jsonData->sensor_name); + break; + case SIG_GENERATOR: if(event != NULL) - { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - if(!LogJSON_i64(kafka,JSON_SIG_GENERATOR_NAME,ntohl(((Unified2EventCommon *)event)->generator_id))) - FatalError("Not enough buffer space to escape msg string\n"); - - } - } - else if(!strncasecmp("sig_id",type,6)) - { + LogJSON_i64(kafka,JSON_SIG_GENERATOR_NAME,ntohl(((Unified2EventCommon *)event)->generator_id)); + break; + case SIG_ID: if(event != NULL) - { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - if(!LogJSON_i64(kafka,JSON_SIG_ID_NAME,ntohl(((Unified2EventCommon *)event)->signature_id))) - FatalError("Not enough buffer space to escape msg string\n"); - } - } - else if(!strncasecmp("sig_rev",type,7)) - { + LogJSON_i64(kafka,JSON_SIG_ID_NAME,ntohl(((Unified2EventCommon *)event)->signature_id)); + break; + case SIG_REV: if(event != NULL) - { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - if(!LogJSON_i64(kafka,JSON_SIG_REV_NAME,ntohl(((Unified2EventCommon *)event)->signature_revision))) - FatalError("Not enough buffer space to escape msg string\n"); - } - } - else if(!strncasecmp("priority",type,sizeof "priority")){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_i64(kafka,JSON_SIG_REV_NAME,ntohl(((Unified2EventCommon *)event)->signature_revision)); + break; + case PRIORITY: if(event != NULL) - { - if(!LogJSON_i32(kafka,JSON_PRIORITY_NAME, ntohl(((Unified2EventCommon *)event)->priority_id))) - FatalError("Not enough buffer space to escape msg string\n"); - }else{ /* Always log something */ - if(!LogJSON_i32(kafka,JSON_PRIORITY_NAME, DEFAULT_PRIORITY)) - FatalError("Not enough buffer space to escape msg string\n"); - } - } - else if(!strncasecmp("classification",type,sizeof "classification")){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + LogJSON_i32(kafka,JSON_PRIORITY_NAME, ntohl(((Unified2EventCommon *)event)->priority_id)); + else /* Always log something */ + LogJSON_i32(kafka,JSON_PRIORITY_NAME, DEFAULT_PRIORITY); + break; + case CLASSIFICATION: if(event != NULL) { uint32_t classification_id = ntohl(((Unified2EventCommon *)event)->classification_id); @@ -598,132 +743,93 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, }else{ /* Always log something */ LogJSON_a(kafka,JSON_CLASSIFICATION_NAME, DEFAULT_CLASSIFICATION); } - } - else if(!strncasecmp("msg", type, 3)) - { + break; + case MSG: if ( event != NULL ) { sn = GetSigByGidSid(ntohl(((Unified2EventCommon *)event)->generator_id), - ntohl(((Unified2EventCommon *)event)->signature_id), - ntohl(((Unified2EventCommon *)event)->signature_revision)); + ntohl(((Unified2EventCommon *)event)->signature_id), + ntohl(((Unified2EventCommon *)event)->signature_revision)); if (sn != NULL) { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); //const int msglen = strlen(sn->msg); - if(!LogJSON_a(kafka,JSON_MSG_NAME,sn->msg)) - { - FatalError("Not enough buffer space to escape msg string\n"); - } + LogJSON_a(kafka,JSON_MSG_NAME,sn->msg); } } - } - else if(!strncasecmp("payload", type, strlen("payload"))) - { - uint16_t i; - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - KafkaLog_Puts(kafka, "\""JSON_PAYLOAD_NAME"\":\""); - if(p && p->dsize>0){ - for(i=0;idsize;++i) - KafkaLog_Print(kafka, "%"PRIx8, p->data[i]); - }else{ - KafkaLog_Puts(kafka, "-"); - } - KafkaLog_Puts(kafka,"\""); - } - else if(!strncasecmp("proto", type, 5)) - { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - if(IPH_IS_VALID(p)) + break; + case PAYLOAD: { - #if 0 - switch (GET_IPH_PROTO(p)) - { - case IPPROTO_UDP: - LogJSON_a(kafka,JSON_PROTO_NAME,"UDP"); - break; - case IPPROTO_TCP: - LogJSON_a(kafka,JSON_PROTO_NAME,"TCP"); - break; - case IPPROTO_ICMP: - LogJSON_a(kafka,JSON_PROTO_NAME,"ICMP"); - break; - default: /* Always log something */ - LogJSON_a(kafka,JSON_PROTO_NAME,"-"); - break; + uint16_t i; + KafkaLog_Puts(kafka, "\""JSON_PAYLOAD_NAME"\":\""); + if(p && p->dsize>0){ + for(i=0;idsize;++i) + KafkaLog_Print(kafka, "%"PRIx8, p->data[i]); + }else{ + KafkaLog_Puts(kafka, DEFAULT_PAYLOAD); } - #endif + KafkaLog_Puts(kafka,"\""); + } + break; + + case PROTO: + if(IPH_IS_VALID(p)) + { Number_str_assoc * service_name_asoc = SearchNumberStr(GET_IPH_PROTO(p),jsonData->protocols,PROTOCOLS); - LogJSON_i16(kafka,JSON_PROTO_ID_NAME,service_name_asoc?service_name_asoc->number.protocol:0); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_PROTO_NAME,service_name_asoc?service_name_asoc->human_readable_str:"-"); + LogJSON_a(kafka,JSON_PROTO_NAME,service_name_asoc?service_name_asoc->human_readable_str:DEFAULT_PROTO); }else{ /* Always log something */ LogJSON_i16(kafka,JSON_PROTO_ID_NAME,0); KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_PROTO_NAME,"-"); + LogJSON_a(kafka,JSON_PROTO_NAME,DEFAULT_PROTO); } - } - else if(!strncasecmp("ethsrc", type, 6)) - { + break; + case PROTO_ID: + LogJSON_i16(kafka,JSON_PROTO_ID_NAME,GET_IPH_PROTO(p)); + break; + + case ETHSRC: if(p->eh) { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_ETHSRC_NAME); KafkaLog_Print(kafka, "\"%X:%X:%X:%X:%X:%X\"", p->eh->ether_src[0], p->eh->ether_src[1], p->eh->ether_src[2], p->eh->ether_src[3], p->eh->ether_src[4], p->eh->ether_src[5]); } - } - else if(!strncasecmp("ethdst", type, 6)) - { + break; + + case ETHDST: if(p->eh) { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_ETHDST_NAME); KafkaLog_Print(kafka, "\"%X:%X:%X:%X:%X:%X\"", p->eh->ether_dst[0], p->eh->ether_dst[1], p->eh->ether_dst[2], p->eh->ether_dst[3], p->eh->ether_dst[4], p->eh->ether_dst[5]); } - } - else if(!strncasecmp("ethtype", type, 7)) - { + break; + + case ETHTYPE: if(p->eh) { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_ETHTYPE_NAME); KafkaLog_Print(kafka, "%"PRIu16,ntohs(p->eh->ether_type)); } - } - else if(!strncasecmp("udplength", type, 9)) - { + break; + + case UDPLENGTH: if(p->udph){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_UDPLENGTH_NAME); KafkaLog_Print(kafka, "%"PRIu16,ntohs(p->udph->uh_len)); } - } - else if(!strncasecmp("ethlen", type, 6)) - { + break; + case ETHLENGTH: if(p->eh){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_ETHLENGTH_NAME); KafkaLog_Print(kafka, "%"PRIu16,p->pkth->len); } - } -#if 0 /* Maybe in the future */ - else if(!strncasecmp("trheader", type, 8)) - { - if(p->trh){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(kafka,JSON_TRHEADER_NAME); - LogTrHeader(kafka, p); - } - } -#endif + break; - else if(!strncasecmp("srcport", type, 7)) - { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + case SRCPORT: + case DSTPORT: if(IPH_IS_VALID(p)) { switch(GET_IPH_PROTO(p)) @@ -731,264 +837,270 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, case IPPROTO_UDP: case IPPROTO_TCP: { - Number_str_assoc * service_name_asoc = SearchNumberStr(p->sp,jsonData->services,SERVICES); - LogJSON_i16(kafka,JSON_SRCPORT_NAME,p->sp); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRCPORT_NAME_NAME,service_name_asoc?service_name_asoc->human_readable_str:"-"); + LogJSON_i16(kafka, + templateElement->id==SRCPORT? JSON_SRCPORT_NAME:JSON_DSTPORT_NAME, + templateElement->id==SRCPORT? p->sp:p->dp); } break; default: /* Always log something */ - LogJSON_i16(kafka,JSON_SRCPORT_NAME,0); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRCPORT_NAME_NAME,"-"); + LogJSON_i16(kafka,templateElement->id==SRCPORT?JSON_SRCPORT_NAME:JSON_DSTPORT_NAME,0); break; } }else{ /* Always Log something */ - LogJSON_i16(kafka,JSON_SRCPORT_NAME,0); + LogJSON_i16(kafka,templateElement->id==SRCPORT?JSON_SRCPORT_NAME:JSON_DSTPORT_NAME,0); } - } - else if(!strncasecmp("dstport", type, 7)) - { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + break; + case SRCPORT_NAME: + case DSTPORT_NAME: if(IPH_IS_VALID(p)) { switch(GET_IPH_PROTO(p)) { case IPPROTO_UDP: case IPPROTO_TCP: - { - Number_str_assoc * service_name_asoc = SearchNumberStr(p->dp,jsonData->services,SERVICES); - LogJSON_i16(kafka,JSON_SRCPORT_NAME,p->dp); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DSTPORT_NAME_NAME,service_name_asoc?service_name_asoc->human_readable_str:"-"); + { + const uint16_t port = templateElement->id==SRCPORT_NAME? p->sp:p->dp; + Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services,SERVICES); + LogJSON_a(kafka, + templateElement->id==SRCPORT_NAME?JSON_SRCPORT_NAME_NAME:JSON_DSTPORT_NAME_NAME, + service_name_asoc?service_name_asoc->human_readable_str:"-"); } break; - default: - LogJSON_a(kafka,JSON_DSTPORT_NAME_NAME,"-"); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_i16(kafka,JSON_DSTPORT_NAME,0); + default: /* Always log something */ + LogJSON_a(kafka,templateElement->id==SRCPORT_NAME?JSON_SRCPORT_NAME_NAME:JSON_DSTPORT_NAME_NAME,"-"); break; - } + }; }else{ /* Always Log something */ - LogJSON_i16(kafka,JSON_DSTPORT_NAME,0); + LogJSON_i16(kafka,templateElement->id==SRCPORT_NAME?JSON_SRCPORT_NAME_NAME:JSON_DSTPORT_NAME_NAME,0); } - } - else if(!strncasecmp("src", type, 3)) // TODO merge with "dst" field - { - static char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; - const size_t bufLen = sizeof buf; - uint32_t ipv4 = IPH_IS_VALID(p) ? ntohl(GET_SRC_ADDR(p).s_addr) : 0; - - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - /* - String version - PrintJSONFieldName(kafka,JSON_SRC_NAME); - LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); - */ - LogJSON_i32(kafka,JSON_SRC_NAME,ipv4); + break; - char * ip_str=NULL,*ip_name=NULL; - Number_str_assoc * ip_str_node = SearchNumberStr(ipv4,jsonData->hosts,HOSTS); - if(ip_str_node){ - ip_str = ip_str_node->number_as_str; - ip_name = ip_str_node->human_readable_str; - }else{ - ip_name = ip_str = _intoa(ipv4, buf, bufLen); + case SRC_TEMPLATE_ID: + LogJSON_i32(kafka,JSON_SRC_NAME,ipv4); + break; + case DST_TEMPLATE_ID: + LogJSON_i32(kafka,JSON_DST_NAME,ipv4); + break; + case SRC_STR: + case DST_STR: + { + LogJSON_a(kafka,templateElement->id == SRC_STR ? JSON_SRC_STR_NAME : JSON_DST_STR_NAME,_intoa(ipv4, buf, bufLen)); } - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_STR_NAME,ip_str); - - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_NAME_NAME,ip_name); - - // networks - Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_NET_NAME,ip_net?ip_net->number_as_str:"0.0.0.0/0"); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_NET_NAME_NAME,ip_net?ip_net->human_readable_str:"0.0.0.0/0"); - - #ifdef HAVE_GEOIP - if(jsonData->gi){ - const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); - const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_COUNTRY_NAME,country_name?country_name:"N/A"); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_SRC_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); + break; + case SRC_NAME: + case DST_NAME: + { + Number_str_assoc * ip_str_node = SearchNumberStr(ipv4,jsonData->hosts,HOSTS); + const char * ip_name = ip_str_node ? ip_str_node->human_readable_str : _intoa(ipv4, buf, bufLen); + LogJSON_a(kafka, templateElement->id == SRC_NAME? JSON_SRC_NAME_NAME:JSON_DST_NAME_NAME,ip_name); } - #endif - } - else if(!strncasecmp("dst", type, 3)) - { - /* @TODO merge with "src" field */ - static char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; - const size_t bufLen = sizeof buf; - uint32_t ipv4 = IPH_IS_VALID(p) ? ntohl(GET_DST_ADDR(p).s_addr) : 0; - - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - /* - String version - PrintJSONFieldName(log,kafka,JSON_SRC_NAME); - LogOrKafka_Quote(log,kafka, inet_ntoa(GET_SRC_ADDR(p))); - */ - LogJSON_i32(kafka,JSON_DST_NAME,ipv4); - - char * ip_str=NULL,*ip_name=NULL; - Number_str_assoc * ip_str_node = SearchNumberStr(ipv4,jsonData->hosts,HOSTS); - if(ip_str_node){ - ip_str = ip_str_node->number_as_str; - ip_name = ip_str_node->human_readable_str; - }else{ - ip_name = ip_str = _intoa(ipv4, buf, bufLen); + break; + case SRC_NET: + case DST_NET: + { + Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); + LogJSON_a(kafka,templateElement->id == SRC_NET? JSON_SRC_NET_NAME : JSON_DST_NET_NAME,ip_net?ip_net->number_as_str:"0.0.0.0/0"); } - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_STR_NAME,ip_str); - - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_NAME_NAME,ip_name); - - // networks - Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_NET_NAME,ip_net?ip_net->number_as_str:"0.0.0.0/0"); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_NET_NAME_NAME,ip_net?ip_net->human_readable_str:"0.0.0.0/0"); + break; + case SRC_NET_NAME: + case DST_NET_NAME: + { + Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); + LogJSON_a(kafka,templateElement->id == SRC_NET_NAME?JSON_SRC_NET_NAME_NAME:JSON_DST_NET_NAME_NAME,ip_net?ip_net->human_readable_str:"0.0.0.0/0"); + } + break; - #ifdef HAVE_GEOIP +#ifdef HAVE_GEOIP + case SRC_COUNTRY: + case DST_COUNTRY: if(jsonData->gi){ const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); + LogJSON_a(kafka,templateElement->id == SRC_COUNTRY ? JSON_SRC_COUNTRY_NAME : JSON_DST_COUNTRY_NAME,country_name?country_name:"N/A"); + } + break; + case SRC_COUNTRY_CODE: + case DST_COUNTRY_CODE: + if(jsonData->gi){ + const uint32_t ipv4 = IPH_IS_VALID(p) ? + ntohl(templateElement->id == SRC_COUNTRY_CODE? GET_SRC_ADDR(p).s_addr : GET_DST_ADDR(p).s_addr) + : 0; const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_COUNTRY_NAME,country_name?country_name:"N/A"); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_DST_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); + LogJSON_a(kafka,templateElement->id == SRC_COUNTRY_CODE ? JSON_SRC_COUNTRY_CODE_NAME : JSON_DST_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); } - #endif - } - else if(!strncasecmp("icmptype",type,8)) - { - if(p->icmph) - { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + break; +#endif /* HAVE_GEOIP */ + + case ICMPTYPE: + if(p->icmph){ PrintJSONFieldName(kafka,JSON_ICMPTYPE_NAME); KafkaLog_Print(kafka, "%d",p->icmph->type); } - } - else if(!strncasecmp("icmpcode",type,8)) - { + break; + case ICMPCODE: if(p->icmph) { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_ICMPCODE_NAME); KafkaLog_Print(kafka, "%d",p->icmph->code); } - } - else if(!strncasecmp("icmpid",type,6)) - { + break; + case ICMPID: if(p->icmph){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_ICMPID_NAME); KafkaLog_Print(kafka, "%d",ntohs(p->icmph->s_icmp_id)); } - } - else if(!strncasecmp("icmpseq",type,7)) - { + break; + case ICMPSEQ: if(p->icmph){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); /* Doesn't work because "%d" arbitrary PrintJSONFieldName(kafka,JSON_ICMPSEQ_NAME); KafkaLog_Print(kafka, "%d",ntohs(p->icmph->s_icmp_seq)); */ LogJSON_i16(kafka,JSON_ICMPSEQ_NAME,ntohs(p->icmph->s_icmp_seq)); } - } - else if(!strncasecmp("ttl",type,3)) - { + break; + case TTL: if(IPH_IS_VALID(p)){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_TTL_NAME); KafkaLog_Print(kafka, "%d",GET_IPH_TTL(p)); } - } - else if(!strncasecmp("tos",type,3)) - { + break; + + case TOS: if(IPH_IS_VALID(p)){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_TOS_NAME); KafkaLog_Print(kafka, "%d",GET_IPH_TOS(p)); } - } - else if(!strncasecmp("id",type,2)) - { + break; + case ID: if(IPH_IS_VALID(p)){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); LogJSON_i16(kafka,JSON_ID_NAME,IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); } - } - else if(!strncasecmp("iplen",type,5)) - { + break; + case IPLEN: if(IPH_IS_VALID(p)){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_IPLEN_NAME); KafkaLog_Print(kafka, "%d",GET_IPH_LEN(p) << 2); } - } - else if(!strncasecmp("dgmlen",type,6)) - { + break; + case DGMLEN: if(IPH_IS_VALID(p)){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_DGMLEN_NAME); // XXX might cause a bug when IPv6 is printed? KafkaLog_Print(kafka, "%d",ntohs(GET_IPH_LEN(p))); } - } - else if(!strncasecmp("tcpseq",type,6)) - { + break; + + case TCPSEQ: if(p->tcph){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); // PrintJSONFieldName(kafka,JSON_TCPSEQ_NAME); // hex format // KafkaLog_Print(kafka, "lX%0x",(u_long) ntohl(p->tcph->th_ack)); // hex format LogJSON_i32(kafka,JSON_TCPSEQ_NAME,ntohl(p->tcph->th_seq)); } - } - else if(!strncasecmp("tcpack",type,6)) - { + break; + case TCPACK: if(p->tcph){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); // PrintJSONFieldName(kafka,JSON_TCPACK_NAME); // KafkaLog_Print(kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); LogJSON_i32(kafka,JSON_TCPACK_NAME,ntohl(p->tcph->th_ack)); } - } - - else if(!strncasecmp("tcplen",type,6)) - { + break; + case TCPLEN: if(p->tcph){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); PrintJSONFieldName(kafka,JSON_TCPLEN_NAME); KafkaLog_Print(kafka, "%d",TCP_OFFSET(p->tcph) << 2); } - } - else if(!strncasecmp("tcpwindow",type,9)) - { + break; + case TCPWINDOW: if(p->tcph){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); //PrintJSONFieldName(kafka,JSON_TCPWINDOW_NAME); // hex format //KafkaLog_Print(kafka, "0x%X",ntohs(p->tcph->th_win)); // hex format LogJSON_i16(kafka,JSON_TCPWINDOW_NAME,ntohs(p->tcph->th_win)); } - } - else if(!strncasecmp("tcpflags",type,8)) - { + break; + case TCPFLAGS: if(p->tcph) { - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); CreateTCPFlagString(p, tcpFlags); PrintJSONFieldName(kafka,JSON_TCPFLAGS_NAME); KafkaLog_Quote(kafka, tcpFlags); } + break; + + default: + *(int *)NULL = 0; + FatalError("Template id %d not found",templateElement->id); /* just for sanity */ + break; + }; + + return kafka->pos-initial_buffer_pos; /* if we have write something */ +} + +/* + * Function: RealAlertJSON(Packet *, char *, FILE *, char *, numargs const int) + * + * Purpose: Write a user defined JSON message + * + * Arguments: p => packet. (could be NULL) + * msg => the message to send + * args => JSON output arguements + * numargs => number of arguements + * log => Log + * Returns: void function + * + */ +static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, + char **args, int numargs, AlertJSONData * jsonData) +{ + int num; + char *type; + TemplateElementsList * iter; + + KafkaLog * kafka = jsonData->kafka; + + if(p == NULL) + return; + + DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging JSON Alert data\n");); + KafkaLog_Putc(kafka,'{'); + for(iter=jsonData->outputTemplate;iter;iter=iter->next){ + const int initial_pos = kafka->pos; + if(iter!=jsonData->outputTemplate) + KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); + const int writed = printElementWithTemplate(p,event,event_type,jsonData,iter->templateElement); + if(0==writed) + kafka->pos = initial_pos; // Revert the insertion of empty element */ + } + + + + + for (num = 0; num < numargs; num++) + { + type = args[num]; + + DEBUG_WRAP(DebugMessage(DEBUG_LOG, "JSON Got type %s %d\n", type, num);); + + + if(0){} + + +#if 0 /* Maybe in the future */ + else if(!strncasecmp("trheader", type, 8)) + { + if(p->trh){ + KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); + PrintJSONFieldName(kafka,JSON_TRHEADER_NAME); + LogTrHeader(kafka, p); + } } +#endif + + + + + + + } From 9a808be225fd8db5f1bd90d5a48c8a5693a7ccae Mon Sep 17 00:00:00 2001 From: eugenio Date: Fri, 12 Jul 2013 10:12:48 +0000 Subject: [PATCH 052/198] Using the json name given in the template --- src/output-plugins/spo_alert_json.c | 238 ++++++---------------------- 1 file changed, 49 insertions(+), 189 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 03a992a..b75c8ab 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -93,66 +93,12 @@ #define FIELD_NAME_VALUE_SEPARATOR ": " #define JSON_FIELDS_SEPARATOR ", " -#define JSON_TIMESTAMP_NAME "event_timestamp" -#define JSON_SENSOR_ID_SNORT_NAME "sensor_id_snort" -#define JSON_SENSOR_ID_NAME "sensor_id" -#define JSON_SENSOR_NAME_NAME "sensor_name" #define SENSOR_NOT_FOUND_NUMBER 0 -#define JSON_SIG_GENERATOR_NAME "sig_generator" -#define JSON_SIG_ID_NAME "sig_id" -#define JSON_SIG_REV_NAME "rev" -#define JSON_PRIORITY_NAME "priority" #define DEFAULT_PRIORITY 0 -#define JSON_CLASSIFICATION_NAME "classification" #define DEFAULT_CLASSIFICATION "-" -#define JSON_MSG_NAME "msg" -#define JSON_PAYLOAD_NAME "payload" #define DEFAULT_PAYLOAD "-" -#define JSON_PROTO_NAME "proto" #define DEFAULT_PROTO "-" -#define JSON_PROTO_ID_NAME "proto_id" #define DEFAULT_PROTO_ID 0 -#define JSON_ETHSRC_NAME "ethsrc" -#define JSON_ETHDST_NAME "ethdst" -#define JSON_ETHTYPE_NAME "ethtype" -#define JSON_UDPLENGTH_NAME "udplength" -#define JSON_ETHLENGTH_NAME "ethlength" -#define JSON_TRHEADER_NAME "trheader" -#define JSON_SRCPORT_NAME "srcport" -#define JSON_DSTPORT_NAME "dstport" -#define JSON_SRCPORT_NAME_NAME "srcport_name" -#define JSON_DSTPORT_NAME_NAME "dstport_name" -#define JSON_SRC_NAME "src" -#define JSON_SRC_STR_NAME "src_str" -#define JSON_SRC_NAME_NAME "src_name" -#define JSON_SRC_NET_NAME "src_net" -#define JSON_SRC_NET_NAME_NAME "src_net_name" -#define JSON_DST_NAME "dst" -#define JSON_DST_NAME_NAME "dst_name" -#define JSON_DST_STR_NAME "dst_str" -#define JSON_DST_NET_NAME "dst_net" -#define JSON_DST_NET_NAME_NAME "dst_net_name" -#define JSON_ICMPTYPE_NAME "icmptype" -#define JSON_ICMPCODE_NAME "icmpcode" -#define JSON_ICMPID_NAME "icmpid" -#define JSON_ICMPSEQ_NAME "icmpseq" -#define JSON_TTL_NAME "ttl" -#define JSON_TOS_NAME "tos" -#define JSON_ID_NAME "id" -#define JSON_IPLEN_NAME "iplen" -#define JSON_DGMLEN_NAME "dgmlen" -#define JSON_TCPSEQ_NAME "tcpseq" -#define JSON_TCPACK_NAME "tcpack" -#define JSON_TCPLEN_NAME "tcplen" -#define JSON_TCPWINDOW_NAME "tcpwindow" -#define JSON_TCPFLAGS_NAME "tcpflags" - -#ifdef HAVE_GEOIP -#define JSON_SRC_COUNTRY_NAME "src_country" -#define JSON_DST_COUNTRY_NAME "dst_country" -#define JSON_SRC_COUNTRY_CODE_NAME "src_country_code" -#define JSON_DST_COUNTRY_CODE_NAME "dst_country_code" -#endif // HAVE_GEOIP #define TIMESTAMP 1 #define SENSOR_ID_SNORT 2 @@ -234,8 +180,6 @@ typedef struct _AlertJSONData { KafkaLog * kafka; char * jsonargs; - char ** args; // @before commit this will be deleted. - int numargs; // same for this TemplateElementsList * outputTemplate; AlertJSONConfig *config; Number_str_assoc * hosts, *nets, *services, *protocols; @@ -310,9 +254,7 @@ static AlertJSONData *AlertJSONParseArgs(char *); static void AlertJSON(Packet *, void *, uint32_t, void *); static void AlertJSONCleanExit(int, void *); static void AlertRestart(int, void *); -static void RealAlertJSON( - Packet*, void*, uint32_t, char **args, int numargs, AlertJSONData * data -); +static void RealAlertJSON(Packet*, void*, uint32_t, AlertJSONData * data); /* * Function: SetupJSON() @@ -472,9 +414,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) } } - data->args = NULL; - data->numargs = 0; - mSplitFree(&toks, num_toks); @@ -572,7 +511,7 @@ static void AlertRestart(int signal, void *arg) static void AlertJSON(Packet *p, void *event, uint32_t event_type, void *arg) { AlertJSONData *data = (AlertJSONData *)arg; - RealAlertJSON(p, event, event_type, data->args, data->numargs, data); + RealAlertJSON(p, event, event_type, data); } static bool inline PrintJSONFieldName(KafkaLog * kafka,const char *fieldName){ @@ -583,18 +522,6 @@ static bool inline LogJSON_int(KafkaLog * kafka, const char * fieldName,uint64_t return PrintJSONFieldName(kafka,fieldName) && KafkaLog_Print(kafka,fmt,fieldValue); } -static bool inline LogJSON_i64(KafkaLog * kafka,const char *fieldName,uint64_t fieldValue){ - return LogJSON_int(kafka,fieldName,fieldValue,"%"PRIu64); -} - -static bool inline LogJSON_i32(KafkaLog * kafka,const char *fieldName,uint32_t fieldValue){ - return LogJSON_int(kafka,fieldName,fieldValue,"%"PRIu32); -} - -static bool inline LogJSON_i16(KafkaLog * kafka,const char *fieldName,uint16_t fieldValue){ - return LogJSON_int(kafka,fieldName,fieldValue,"%"PRIu16); -} - static bool inline LogJSON_a(KafkaLog *kafka,const char *fieldName,const char *fieldValue){ bool aok = 1; if(aok) aok = KafkaLog_Quote(kafka,fieldName); @@ -687,49 +614,36 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type }; } - /* Printing name of field. At the moment, we don't use the template one.*/ - #if 0 - PrintJSONFieldName(kafka,templateElement->jsonName); - if(templateElement->printFormat == stringFormat) - KafkaLog_Putc('"'); - #endif - - - switch(templateElement->id){ case TIMESTAMP: - LogJSON_i64(kafka,JSON_TIMESTAMP_NAME,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000); + KafkaLog_Print(kafka,"%"PRIu64,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000); break; case SENSOR_ID_SNORT: if(event != NULL) - LogJSON_i32(kafka,JSON_SENSOR_ID_SNORT_NAME,ntohl(((Unified2EventCommon *)event)->sensor_id)); + KafkaLog_Print(kafka,"%"PRIu32,ntohl(((Unified2EventCommon *)event)->sensor_id)); else - LogJSON_i32(kafka,JSON_SENSOR_ID_SNORT_NAME,SENSOR_NOT_FOUND_NUMBER); + KafkaLog_Print(kafka,"%"PRIu32,SENSOR_NOT_FOUND_NUMBER); break; case SENSOR_ID: - LogJSON_i32(kafka,JSON_SENSOR_ID_NAME,jsonData->sensor_id); + KafkaLog_Print(kafka,"%"PRIu32,jsonData->sensor_id); break; - case SENSOR_NAME: - LogJSON_a(kafka,JSON_SENSOR_NAME_NAME,jsonData->sensor_name); + KafkaLog_Print(kafka,jsonData->sensor_name); break; case SIG_GENERATOR: if(event != NULL) - LogJSON_i64(kafka,JSON_SIG_GENERATOR_NAME,ntohl(((Unified2EventCommon *)event)->generator_id)); + KafkaLog_Print(kafka,"%"PRIu64,ntohl(((Unified2EventCommon *)event)->generator_id)); break; case SIG_ID: if(event != NULL) - LogJSON_i64(kafka,JSON_SIG_ID_NAME,ntohl(((Unified2EventCommon *)event)->signature_id)); + KafkaLog_Print(kafka,"%"PRIu64,ntohl(((Unified2EventCommon *)event)->signature_id)); break; case SIG_REV: if(event != NULL) - LogJSON_i64(kafka,JSON_SIG_REV_NAME,ntohl(((Unified2EventCommon *)event)->signature_revision)); + KafkaLog_Print(kafka,"%"PRIu64,ntohl(((Unified2EventCommon *)event)->signature_revision)); break; case PRIORITY: - if(event != NULL) - LogJSON_i32(kafka,JSON_PRIORITY_NAME, ntohl(((Unified2EventCommon *)event)->priority_id)); - else /* Always log something */ - LogJSON_i32(kafka,JSON_PRIORITY_NAME, DEFAULT_PRIORITY); + KafkaLog_Print(kafka,"%"PRIu32, event != NULL ? ntohl(((Unified2EventCommon *)event)->priority_id) : DEFAULT_PRIORITY); break; case CLASSIFICATION: if(event != NULL) @@ -737,11 +651,11 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type uint32_t classification_id = ntohl(((Unified2EventCommon *)event)->classification_id); ClassType *cn = ClassTypeLookupById(barnyard2_conf, classification_id); if ( cn != NULL ) - LogJSON_a(kafka,JSON_CLASSIFICATION_NAME,cn->name); + KafkaLog_Print(kafka,cn->name); else - LogJSON_a(kafka,JSON_CLASSIFICATION_NAME, DEFAULT_CLASSIFICATION); + KafkaLog_Print(kafka, DEFAULT_CLASSIFICATION); }else{ /* Always log something */ - LogJSON_a(kafka,JSON_CLASSIFICATION_NAME, DEFAULT_CLASSIFICATION); + KafkaLog_Print(kafka, DEFAULT_CLASSIFICATION); } break; case MSG: @@ -754,44 +668,38 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if (sn != NULL) { //const int msglen = strlen(sn->msg); - LogJSON_a(kafka,JSON_MSG_NAME,sn->msg); + KafkaLog_Print(kafka,sn->msg); } } break; case PAYLOAD: { uint16_t i; - KafkaLog_Puts(kafka, "\""JSON_PAYLOAD_NAME"\":\""); if(p && p->dsize>0){ for(i=0;idsize;++i) KafkaLog_Print(kafka, "%"PRIx8, p->data[i]); }else{ KafkaLog_Puts(kafka, DEFAULT_PAYLOAD); } - KafkaLog_Puts(kafka,"\""); } break; case PROTO: - if(IPH_IS_VALID(p)) - { + if(IPH_IS_VALID(p)){ Number_str_assoc * service_name_asoc = SearchNumberStr(GET_IPH_PROTO(p),jsonData->protocols,PROTOCOLS); - LogJSON_a(kafka,JSON_PROTO_NAME,service_name_asoc?service_name_asoc->human_readable_str:DEFAULT_PROTO); + KafkaLog_Print(kafka,"%"PRIu16,service_name_asoc?service_name_asoc->human_readable_str:DEFAULT_PROTO); }else{ /* Always log something */ - LogJSON_i16(kafka,JSON_PROTO_ID_NAME,0); - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - LogJSON_a(kafka,JSON_PROTO_NAME,DEFAULT_PROTO); + KafkaLog_Print(kafka,"%"PRIu16,DEFAULT_PROTO); } break; case PROTO_ID: - LogJSON_i16(kafka,JSON_PROTO_ID_NAME,GET_IPH_PROTO(p)); + KafkaLog_Print(kafka,"%"PRIu16,IPH_IS_VALID(p)?GET_IPH_PROTO(p):0); break; case ETHSRC: if(p->eh) { - PrintJSONFieldName(kafka,JSON_ETHSRC_NAME); - KafkaLog_Print(kafka, "\"%X:%X:%X:%X:%X:%X\"", p->eh->ether_src[0], + KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X", p->eh->ether_src[0], p->eh->ether_src[1], p->eh->ether_src[2], p->eh->ether_src[3], p->eh->ether_src[4], p->eh->ether_src[5]); } @@ -800,8 +708,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case ETHDST: if(p->eh) { - PrintJSONFieldName(kafka,JSON_ETHDST_NAME); - KafkaLog_Print(kafka, "\"%X:%X:%X:%X:%X:%X\"", p->eh->ether_dst[0], + KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X", p->eh->ether_dst[0], p->eh->ether_dst[1], p->eh->ether_dst[2], p->eh->ether_dst[3], p->eh->ether_dst[4], p->eh->ether_dst[5]); } @@ -810,20 +717,17 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case ETHTYPE: if(p->eh) { - PrintJSONFieldName(kafka,JSON_ETHTYPE_NAME); KafkaLog_Print(kafka, "%"PRIu16,ntohs(p->eh->ether_type)); } break; case UDPLENGTH: if(p->udph){ - PrintJSONFieldName(kafka,JSON_UDPLENGTH_NAME); KafkaLog_Print(kafka, "%"PRIu16,ntohs(p->udph->uh_len)); } break; case ETHLENGTH: if(p->eh){ - PrintJSONFieldName(kafka,JSON_ETHLENGTH_NAME); KafkaLog_Print(kafka, "%"PRIu16,p->pkth->len); } break; @@ -837,17 +741,15 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case IPPROTO_UDP: case IPPROTO_TCP: { - LogJSON_i16(kafka, - templateElement->id==SRCPORT? JSON_SRCPORT_NAME:JSON_DSTPORT_NAME, - templateElement->id==SRCPORT? p->sp:p->dp); + KafkaLog_Print(kafka,"%"PRIu16,templateElement->id==SRCPORT? p->sp:p->dp); } break; default: /* Always log something */ - LogJSON_i16(kafka,templateElement->id==SRCPORT?JSON_SRCPORT_NAME:JSON_DSTPORT_NAME,0); + KafkaLog_Print(kafka,"%"PRIu16,0); break; } }else{ /* Always Log something */ - LogJSON_i16(kafka,templateElement->id==SRCPORT?JSON_SRCPORT_NAME:JSON_DSTPORT_NAME,0); + KafkaLog_Print(kafka,"%"PRIu16,0); } break; case SRCPORT_NAME: @@ -861,30 +763,28 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type { const uint16_t port = templateElement->id==SRCPORT_NAME? p->sp:p->dp; Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services,SERVICES); - LogJSON_a(kafka, - templateElement->id==SRCPORT_NAME?JSON_SRCPORT_NAME_NAME:JSON_DSTPORT_NAME_NAME, - service_name_asoc?service_name_asoc->human_readable_str:"-"); + KafkaLog_Print(kafka,"%s",service_name_asoc?service_name_asoc->human_readable_str:"-"); } break; default: /* Always log something */ - LogJSON_a(kafka,templateElement->id==SRCPORT_NAME?JSON_SRCPORT_NAME_NAME:JSON_DSTPORT_NAME_NAME,"-"); + KafkaLog_Print(kafka,"%s","-"); break; }; }else{ /* Always Log something */ - LogJSON_i16(kafka,templateElement->id==SRCPORT_NAME?JSON_SRCPORT_NAME_NAME:JSON_DSTPORT_NAME_NAME,0); + KafkaLog_Print(kafka,"%s","-"); } break; case SRC_TEMPLATE_ID: - LogJSON_i32(kafka,JSON_SRC_NAME,ipv4); + KafkaLog_Print(kafka,"%"PRIu32,ipv4); break; case DST_TEMPLATE_ID: - LogJSON_i32(kafka,JSON_DST_NAME,ipv4); + KafkaLog_Print(kafka,"%"PRIu32,ipv4); break; case SRC_STR: case DST_STR: { - LogJSON_a(kafka,templateElement->id == SRC_STR ? JSON_SRC_STR_NAME : JSON_DST_STR_NAME,_intoa(ipv4, buf, bufLen)); + KafkaLog_Print(kafka,"%s",_intoa(ipv4, buf, bufLen)); } break; case SRC_NAME: @@ -892,21 +792,21 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type { Number_str_assoc * ip_str_node = SearchNumberStr(ipv4,jsonData->hosts,HOSTS); const char * ip_name = ip_str_node ? ip_str_node->human_readable_str : _intoa(ipv4, buf, bufLen); - LogJSON_a(kafka, templateElement->id == SRC_NAME? JSON_SRC_NAME_NAME:JSON_DST_NAME_NAME,ip_name); + KafkaLog_Print(kafka, "%s",ip_name); } break; case SRC_NET: case DST_NET: { Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); - LogJSON_a(kafka,templateElement->id == SRC_NET? JSON_SRC_NET_NAME : JSON_DST_NET_NAME,ip_net?ip_net->number_as_str:"0.0.0.0/0"); + KafkaLog_Print(kafka,"%s",ip_net?ip_net->number_as_str:"0.0.0.0/0"); } break; case SRC_NET_NAME: case DST_NET_NAME: { Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); - LogJSON_a(kafka,templateElement->id == SRC_NET_NAME?JSON_SRC_NET_NAME_NAME:JSON_DST_NET_NAME_NAME,ip_net?ip_net->human_readable_str:"0.0.0.0/0"); + KafkaLog_Print(kafka,"%s",ip_net?ip_net->human_readable_str:"0.0.0.0/0"); } break; @@ -915,37 +815,31 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case DST_COUNTRY: if(jsonData->gi){ const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); - LogJSON_a(kafka,templateElement->id == SRC_COUNTRY ? JSON_SRC_COUNTRY_NAME : JSON_DST_COUNTRY_NAME,country_name?country_name:"N/A"); + KafkaLog_Print(kafka,"%s",country_name?country_name:"N/A"); } break; case SRC_COUNTRY_CODE: case DST_COUNTRY_CODE: if(jsonData->gi){ - const uint32_t ipv4 = IPH_IS_VALID(p) ? - ntohl(templateElement->id == SRC_COUNTRY_CODE? GET_SRC_ADDR(p).s_addr : GET_DST_ADDR(p).s_addr) - : 0; const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); - LogJSON_a(kafka,templateElement->id == SRC_COUNTRY_CODE ? JSON_SRC_COUNTRY_CODE_NAME : JSON_DST_COUNTRY_CODE_NAME,country_code?country_code:"N/A"); + KafkaLog_Print(kafka,"%s",country_code?country_code:"N/A"); } break; #endif /* HAVE_GEOIP */ case ICMPTYPE: if(p->icmph){ - PrintJSONFieldName(kafka,JSON_ICMPTYPE_NAME); KafkaLog_Print(kafka, "%d",p->icmph->type); } break; case ICMPCODE: if(p->icmph) { - PrintJSONFieldName(kafka,JSON_ICMPCODE_NAME); KafkaLog_Print(kafka, "%d",p->icmph->code); } break; case ICMPID: if(p->icmph){ - PrintJSONFieldName(kafka,JSON_ICMPID_NAME); KafkaLog_Print(kafka, "%d",ntohs(p->icmph->s_icmp_id)); } break; @@ -955,36 +849,32 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type PrintJSONFieldName(kafka,JSON_ICMPSEQ_NAME); KafkaLog_Print(kafka, "%d",ntohs(p->icmph->s_icmp_seq)); */ - LogJSON_i16(kafka,JSON_ICMPSEQ_NAME,ntohs(p->icmph->s_icmp_seq)); + KafkaLog_Print(kafka,"%"PRIu16,ntohs(p->icmph->s_icmp_seq)); } break; case TTL: if(IPH_IS_VALID(p)){ - PrintJSONFieldName(kafka,JSON_TTL_NAME); KafkaLog_Print(kafka, "%d",GET_IPH_TTL(p)); } break; case TOS: if(IPH_IS_VALID(p)){ - PrintJSONFieldName(kafka,JSON_TOS_NAME); KafkaLog_Print(kafka, "%d",GET_IPH_TOS(p)); } break; case ID: if(IPH_IS_VALID(p)){ - LogJSON_i16(kafka,JSON_ID_NAME,IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); + KafkaLog_Print(kafka,"%"PRIu16,IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); } break; case IPLEN: if(IPH_IS_VALID(p)){ - PrintJSONFieldName(kafka,JSON_IPLEN_NAME); KafkaLog_Print(kafka, "%d",GET_IPH_LEN(p) << 2); } break; case DGMLEN: if(IPH_IS_VALID(p)){ - PrintJSONFieldName(kafka,JSON_DGMLEN_NAME); // XXX might cause a bug when IPv6 is printed? KafkaLog_Print(kafka, "%d",ntohs(GET_IPH_LEN(p))); } @@ -994,19 +884,18 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(p->tcph){ // PrintJSONFieldName(kafka,JSON_TCPSEQ_NAME); // hex format // KafkaLog_Print(kafka, "lX%0x",(u_long) ntohl(p->tcph->th_ack)); // hex format - LogJSON_i32(kafka,JSON_TCPSEQ_NAME,ntohl(p->tcph->th_seq)); + KafkaLog_Print(kafka,"%"PRIx32,ntohl(p->tcph->th_seq)); } break; case TCPACK: if(p->tcph){ // PrintJSONFieldName(kafka,JSON_TCPACK_NAME); // KafkaLog_Print(kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); - LogJSON_i32(kafka,JSON_TCPACK_NAME,ntohl(p->tcph->th_ack)); + KafkaLog_Print(kafka,"%"PRIx32,ntohl(p->tcph->th_ack)); } break; case TCPLEN: if(p->tcph){ - PrintJSONFieldName(kafka,JSON_TCPLEN_NAME); KafkaLog_Print(kafka, "%d",TCP_OFFSET(p->tcph) << 2); } break; @@ -1014,14 +903,13 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(p->tcph){ //PrintJSONFieldName(kafka,JSON_TCPWINDOW_NAME); // hex format //KafkaLog_Print(kafka, "0x%X",ntohs(p->tcph->th_win)); // hex format - LogJSON_i16(kafka,JSON_TCPWINDOW_NAME,ntohs(p->tcph->th_win)); + KafkaLog_Print(kafka,"%"PRIx16,ntohs(p->tcph->th_win)); } break; case TCPFLAGS: if(p->tcph) { CreateTCPFlagString(p, tcpFlags); - PrintJSONFieldName(kafka,JSON_TCPFLAGS_NAME); KafkaLog_Quote(kafka, tcpFlags); } break; @@ -1048,11 +936,8 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type * Returns: void function * */ -static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, - char **args, int numargs, AlertJSONData * jsonData) +static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSONData * jsonData) { - int num; - char *type; TemplateElementsList * iter; KafkaLog * kafka = jsonData->kafka; @@ -1066,42 +951,17 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, const int initial_pos = kafka->pos; if(iter!=jsonData->outputTemplate) KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); - const int writed = printElementWithTemplate(p,event,event_type,jsonData,iter->templateElement); - if(0==writed) - kafka->pos = initial_pos; // Revert the insertion of empty element */ - } - - - - - for (num = 0; num < numargs; num++) - { - type = args[num]; - DEBUG_WRAP(DebugMessage(DEBUG_LOG, "JSON Got type %s %d\n", type, num);); + KafkaLog_Print(kafka,"\"%s\":",iter->templateElement->jsonName); - - if(0){} - - -#if 0 /* Maybe in the future */ - else if(!strncasecmp("trheader", type, 8)) - { - if(p->trh){ - KafkaLog_Puts(kafka, JSON_FIELDS_SEPARATOR); - PrintJSONFieldName(kafka,JSON_TRHEADER_NAME); - LogTrHeader(kafka, p); - } - } -#endif - - - - - - - + if(iter->templateElement->printFormat==stringFormat) + KafkaLog_Putc(kafka,'"'); + const int writed = printElementWithTemplate(p,event,event_type,jsonData,iter->templateElement); + if(iter->templateElement->printFormat==stringFormat) + KafkaLog_Putc(kafka,'"'); + if(0==writed) + kafka->pos = initial_pos; // Revert the insertion of empty element */ } KafkaLog_Putc(kafka,'}'); From 3e97959104b83a8bffc37169a5be9f959496d1f7 Mon Sep 17 00:00:00 2001 From: eugenio Date: Fri, 12 Jul 2013 10:23:43 +0000 Subject: [PATCH 053/198] Added a "default value" field in the template --- src/output-plugins/spo_alert_json.c | 148 +++++++++++++--------------- 1 file changed, 68 insertions(+), 80 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index b75c8ab..e2b70ff 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -93,13 +93,6 @@ #define FIELD_NAME_VALUE_SEPARATOR ": " #define JSON_FIELDS_SEPARATOR ", " -#define SENSOR_NOT_FOUND_NUMBER 0 -#define DEFAULT_PRIORITY 0 -#define DEFAULT_CLASSIFICATION "-" -#define DEFAULT_PAYLOAD "-" -#define DEFAULT_PROTO "-" -#define DEFAULT_PROTO_ID 0 - #define TIMESTAMP 1 #define SENSOR_ID_SNORT 2 #define SENSOR_ID 3 @@ -164,6 +157,7 @@ typedef struct{ const char * templateName; const char * jsonName; const JsonPrintFormat printFormat; + void * defaultValue; } AlertJSONTemplateElement; typedef struct _TemplateElementsList{ @@ -192,60 +186,60 @@ typedef struct _AlertJSONData /* Remember update printElementWithTemplate if some element modified here */ static AlertJSONTemplateElement template[] = { - {TIMESTAMP,"timestamp","event_timestamp",numericFormat}, - {SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat}, - {SENSOR_ID,"sensor_id","sensor_id",numericFormat}, - {SENSOR_NAME,"sensor_name","sensor_name",stringFormat}, - {SIG_GENERATOR,"sig_generator","sig_generator",numericFormat}, - {SIG_ID,"sig_id","sig_id",numericFormat}, - {SIG_REV,"sig_rev","rev",numericFormat}, - {PRIORITY,"priority","priority",numericFormat}, - {CLASSIFICATION,"classification","classification",stringFormat}, - {MSG,"msg","msg",stringFormat}, - {PAYLOAD,"payload","payload",stringFormat}, - {PROTO,"proto","proto",stringFormat}, - {PROTO_ID,"proto_id","proto_id",numericFormat}, - {ETHSRC,"ethsrc","ethsrc",stringFormat}, - {ETHDST,"ethdst","ethdst",stringFormat}, - {ETHTYPE,"ethtype","ethtype",numericFormat}, - {UDPLENGTH,"udplength","udplength",numericFormat}, - {ETHLENGTH,"ethlen","ethlength",numericFormat}, - {TRHEADER,"trheader","trheader",stringFormat}, - {SRCPORT,"srcport","srcport",numericFormat}, - {SRCPORT_NAME,"srcport_name","srcport_name",stringFormat}, - {DSTPORT,"dstport","dstport",numericFormat}, - {DSTPORT_NAME,"dstport_name","dstport_name",stringFormat}, - {SRC_TEMPLATE_ID,"src","src",numericFormat}, - {SRC_STR,"src_str","src_str",stringFormat}, - {SRC_NAME,"src_name","src_name",stringFormat}, - {SRC_NET,"src_net","src_net",stringFormat}, - {SRC_NET_NAME,"src_net_name","src_net_name",stringFormat}, - {DST_TEMPLATE_ID,"dst","dst",numericFormat}, - {DST_NAME,"dst_name","dst_name",stringFormat}, - {DST_STR,"dst_str","dst_str",stringFormat}, - {DST_NET,"dst_net","dst_net",stringFormat}, - {DST_NET_NAME,"dst_net_name","dst_net_name",stringFormat}, - {ICMPTYPE,"icmptype","icmptype",numericFormat}, - {ICMPCODE,"icmpcode","icmpcode",numericFormat}, - {ICMPID,"icmpid","icmpid",numericFormat}, - {ICMPSEQ,"icmpseq","icmpseq",numericFormat}, - {TTL,"ttl","ttl",numericFormat}, - {TOS,"tos","tos",numericFormat}, - {ID,"id","id",numericFormat}, - {IPLEN,"iplen","iplen",numericFormat}, - {DGMLEN,"dgmlen","dgmlen",numericFormat}, - {TCPSEQ,"tcpseq","tcpseq",numericFormat}, - {TCPACK,"tcpack","tcpack",numericFormat}, - {TCPLEN,"tcplen","tcplen",numericFormat}, - {TCPWINDOW,"tcpwindow","tcpwindow",numericFormat}, - {TCPFLAGS,"tcpflags","tcpflags",stringFormat}, + {TIMESTAMP,"timestamp","event_timestamp",numericFormat,0}, + {SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat,0}, + {SENSOR_ID,"sensor_id","sensor_id",numericFormat,0}, + {SENSOR_NAME,"sensor_name","sensor_name",stringFormat,"-"}, + {SIG_GENERATOR,"sig_generator","sig_generator",numericFormat,0}, + {SIG_ID,"sig_id","sig_id",numericFormat,0}, + {SIG_REV,"sig_rev","rev",numericFormat,0}, + {PRIORITY,"priority","priority",numericFormat,0}, + {CLASSIFICATION,"classification","classification",stringFormat,"-"}, + {MSG,"msg","msg",stringFormat,"-"}, + {PAYLOAD,"payload","payload",stringFormat,"-"}, + {PROTO,"proto","proto",stringFormat,"-"}, + {PROTO_ID,"proto_id","proto_id",numericFormat,0}, + {ETHSRC,"ethsrc","ethsrc",stringFormat,"-"}, + {ETHDST,"ethdst","ethdst",stringFormat,"-"}, + {ETHTYPE,"ethtype","ethtype",numericFormat,0}, + {UDPLENGTH,"udplength","udplength",numericFormat,0}, + {ETHLENGTH,"ethlen","ethlength",numericFormat,0}, + {TRHEADER,"trheader","trheader",stringFormat,"-"}, + {SRCPORT,"srcport","srcport",numericFormat,0}, + {SRCPORT_NAME,"srcport_name","srcport_name",stringFormat,"-"}, + {DSTPORT,"dstport","dstport",numericFormat,0}, + {DSTPORT_NAME,"dstport_name","dstport_name",stringFormat,"-"}, + {SRC_TEMPLATE_ID,"src","src",numericFormat,0}, + {SRC_STR,"src_str","src_str",stringFormat,"-"}, + {SRC_NAME,"src_name","src_name",stringFormat,"-"}, + {SRC_NET,"src_net","src_net",stringFormat,"0.0.0.0/0"}, + {SRC_NET_NAME,"src_net_name","src_net_name",stringFormat,"0.0.0.0/0"}, + {DST_TEMPLATE_ID,"dst","dst",numericFormat,0}, + {DST_NAME,"dst_name","dst_name",stringFormat,"-"}, + {DST_STR,"dst_str","dst_str",stringFormat,"-"}, + {DST_NET,"dst_net","dst_net",stringFormat,"0.0.0.0/0"}, + {DST_NET_NAME,"dst_net_name","dst_net_name",stringFormat,"0.0.0.0/0"}, + {ICMPTYPE,"icmptype","icmptype",numericFormat,0}, + {ICMPCODE,"icmpcode","icmpcode",numericFormat,0}, + {ICMPID,"icmpid","icmpid",numericFormat,0}, + {ICMPSEQ,"icmpseq","icmpseq",numericFormat,0}, + {TTL,"ttl","ttl",numericFormat,0}, + {TOS,"tos","tos",numericFormat,0}, + {ID,"id","id",numericFormat,0}, + {IPLEN,"iplen","iplen",numericFormat,0}, + {DGMLEN,"dgmlen","dgmlen",numericFormat,0}, + {TCPSEQ,"tcpseq","tcpseq",numericFormat,0}, + {TCPACK,"tcpack","tcpack",numericFormat,0}, + {TCPLEN,"tcplen","tcplen",numericFormat,0}, + {TCPWINDOW,"tcpwindow","tcpwindow",numericFormat,0}, + {TCPFLAGS,"tcpflags","tcpflags",stringFormat,"-"}, #ifdef HAVE_GEOIP - {SRC_COUNTRY,"src_country","src_country",stringFormat}, - {DST_COUNTRY,"dst_country","dst_country",stringFormat}, - {SRC_COUNTRY_CODE,"src_country_code","src_country_code",stringFormat}, - {DST_COUNTRY_CODE,"dst_country_code","dst_country_code",stringFormat}, + {SRC_COUNTRY,"src_country","src_country",stringFormat,"N/A"}, + {DST_COUNTRY,"dst_country","dst_country",stringFormat,"N/A"}, + {SRC_COUNTRY_CODE,"src_country_code","src_country_code",stringFormat,"N/A"}, + {DST_COUNTRY_CODE,"dst_country_code","dst_country_code",stringFormat,"N/A"}, #endif /* HAVE_GEOIP */ - {TEMPLATE_END_ID,"","",numericFormat} + {TEMPLATE_END_ID,"","",numericFormat,0} }; /* list of function prototypes for this preprocessor */ @@ -619,10 +613,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type KafkaLog_Print(kafka,"%"PRIu64,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000); break; case SENSOR_ID_SNORT: - if(event != NULL) - KafkaLog_Print(kafka,"%"PRIu32,ntohl(((Unified2EventCommon *)event)->sensor_id)); - else - KafkaLog_Print(kafka,"%"PRIu32,SENSOR_NOT_FOUND_NUMBER); + KafkaLog_Print(kafka,"%"PRIu32,event?ntohl(((Unified2EventCommon *)event)->sensor_id):(uint64_t)templateElement->defaultValue); break; case SENSOR_ID: KafkaLog_Print(kafka,"%"PRIu32,jsonData->sensor_id); @@ -643,19 +634,16 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type KafkaLog_Print(kafka,"%"PRIu64,ntohl(((Unified2EventCommon *)event)->signature_revision)); break; case PRIORITY: - KafkaLog_Print(kafka,"%"PRIu32, event != NULL ? ntohl(((Unified2EventCommon *)event)->priority_id) : DEFAULT_PRIORITY); + KafkaLog_Print(kafka,"%"PRIu32, event != NULL ? ntohl(((Unified2EventCommon *)event)->priority_id) : (uint64_t)templateElement->defaultValue); break; case CLASSIFICATION: if(event != NULL) { uint32_t classification_id = ntohl(((Unified2EventCommon *)event)->classification_id); - ClassType *cn = ClassTypeLookupById(barnyard2_conf, classification_id); - if ( cn != NULL ) - KafkaLog_Print(kafka,cn->name); - else - KafkaLog_Print(kafka, DEFAULT_CLASSIFICATION); + const ClassType *cn = ClassTypeLookupById(barnyard2_conf, classification_id); + KafkaLog_Print(kafka,cn?cn->name:(const char *)templateElement->defaultValue); }else{ /* Always log something */ - KafkaLog_Print(kafka, DEFAULT_CLASSIFICATION); + KafkaLog_Print(kafka, (const char *)templateElement->defaultValue); } break; case MSG: @@ -679,7 +667,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type for(i=0;idsize;++i) KafkaLog_Print(kafka, "%"PRIx8, p->data[i]); }else{ - KafkaLog_Puts(kafka, DEFAULT_PAYLOAD); + KafkaLog_Puts(kafka, (const char *)templateElement->defaultValue); } } break; @@ -687,9 +675,9 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case PROTO: if(IPH_IS_VALID(p)){ Number_str_assoc * service_name_asoc = SearchNumberStr(GET_IPH_PROTO(p),jsonData->protocols,PROTOCOLS); - KafkaLog_Print(kafka,"%"PRIu16,service_name_asoc?service_name_asoc->human_readable_str:DEFAULT_PROTO); + KafkaLog_Print(kafka,"%s",service_name_asoc?service_name_asoc->human_readable_str:(const char *)templateElement->defaultValue); }else{ /* Always log something */ - KafkaLog_Print(kafka,"%"PRIu16,DEFAULT_PROTO); + KafkaLog_Print(kafka,"%s",(const char *)templateElement->defaultValue); } break; case PROTO_ID: @@ -763,15 +751,15 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type { const uint16_t port = templateElement->id==SRCPORT_NAME? p->sp:p->dp; Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services,SERVICES); - KafkaLog_Print(kafka,"%s",service_name_asoc?service_name_asoc->human_readable_str:"-"); + KafkaLog_Print(kafka,"%s",service_name_asoc?service_name_asoc->human_readable_str:(const char *)templateElement->defaultValue); } break; default: /* Always log something */ - KafkaLog_Print(kafka,"%s","-"); + KafkaLog_Print(kafka,"%s",(const char *)templateElement->defaultValue); break; }; }else{ /* Always Log something */ - KafkaLog_Print(kafka,"%s","-"); + KafkaLog_Print(kafka,"%s",(const char *)templateElement->defaultValue); } break; @@ -799,14 +787,14 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case DST_NET: { Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); - KafkaLog_Print(kafka,"%s",ip_net?ip_net->number_as_str:"0.0.0.0/0"); + KafkaLog_Print(kafka,"%s",ip_net?ip_net->number_as_str:(const char *)templateElement->defaultValue); } break; case SRC_NET_NAME: case DST_NET_NAME: { Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); - KafkaLog_Print(kafka,"%s",ip_net?ip_net->human_readable_str:"0.0.0.0/0"); + KafkaLog_Print(kafka,"%s",ip_net?ip_net->human_readable_str:(const char *)templateElement->defaultValue); } break; @@ -815,14 +803,14 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case DST_COUNTRY: if(jsonData->gi){ const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); - KafkaLog_Print(kafka,"%s",country_name?country_name:"N/A"); + KafkaLog_Print(kafka,"%s",country_name?country_name:(const char *)templateElement->defaultValue); } break; case SRC_COUNTRY_CODE: case DST_COUNTRY_CODE: if(jsonData->gi){ const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); - KafkaLog_Print(kafka,"%s",country_code?country_code:"N/A"); + KafkaLog_Print(kafka,"%s",country_code?country_code:(const char *)templateElement->defaultValue); } break; #endif /* HAVE_GEOIP */ From 97588630543d4ed8ef53d1bc62b15506aa091d74 Mon Sep 17 00:00:00 2001 From: eugenio Date: Fri, 12 Jul 2013 12:03:30 +0000 Subject: [PATCH 054/198] Update doc --- doc/README.alert_json | 86 ++++++++++++++++++++++++----- src/output-plugins/spo_alert_json.c | 34 +++++++----- src/rbutil/rb_numstrpair_list.h | 7 +-- 3 files changed, 95 insertions(+), 32 deletions(-) diff --git a/doc/README.alert_json b/doc/README.alert_json index d4e4226..0f36fde 100644 --- a/doc/README.alert_json +++ b/doc/README.alert_json @@ -11,34 +11,92 @@ And alert_json plugin will print the barnyard2 output in the correspond file. 1 Using alert_json kafka's capabilities -If you want to use kafka in alert_json barnyard2 plugin, you have to put it in barnyard2.conf file. The format -of the argument passed to the plugin is: -output alert_json: kafka://:@ - +If you want to use Apache Kafka in alert_json barnyard2 plugin, you have to put it in barnyard2.conf +file. The format of the argument passed to the plugin is: +output alert_json: kafka://:@ start_partition=1 end_partition=5 Where host, port and topic are the kafka host, port and topic (not zookeepers one). - +You can send to multiple partitions with start_ and end_partition. These values are 0 and +start_partition by default. Make sure to set end_partition AFTER start_partition. Otherwise it +will be overwrited. Also, you have to configure the project using --enable-kafka flag, and install librdkafka libraries (see https://github.com/edenhill/librdkafka/ for details). - 2 Host and network in readable format: -Alert_json can print a human readable string plus the default host string. For example, if you + 2 Host and network name resolution +Alert_json can print a human readable string and the default host string. For example, if you have the hostname “foo PC†associated with the “192.168.100.3†ip in /etc/hosts file, alert_json will -print “foo PC†plus “192.168.100.3†and the number representation of the ip. In the same way, +print “foo PC†and “192.168.100.3†and the number representation of the ip. In the same way, alert_json can print the destination or source network of the packet. You have to make an entry in “/etc/barnyard_networks†indicating this. For example, the entry “192.168.100.0/24 foo -network†will make alert_json print the network name plus the network id. In case alert_json does -not locate the network in the file, it will print “0.0.0.0/0†instead. +network†will make alert_json print the network name and the network id. In case alert_json does +not locate the network in the file, it will print “0.0.0.0/0†instead. Alert_json can do the same +function to services and protocol names, reading it from /etc/services and /etc/protocols files. +If you want to use these functions, you have to specify these files in plugin's params: + +output alert_json: ... hosts=/etc/hosts networks=/etc/networks services=/etc/services +protocols=/etc/protocols ... + +And you have to be sure they are in the template. The default template has it, but if you don't +specify the files, it will always print "0", "0.0.0.0" or "0.0.0.0/0". + +The output names are: src_name, dst_name, src_net, src_net_name, dst_net, dst_net_name, proto, +proto_id, srcport_name, dstport_name. 3 GeoIP Alert_json can locate the region of the IP too. You just have to have libGeoIP installed and compile -the sources with GEO_IP macro defined (it's defined by default). Also, you have to put the database -in “/usr/local/share/GeoIP/GeoIP.dat†+the sources with GEO_IP macro defined (it's defined by default). Also, you have to specify the +database location in json arguments, for example: + +output alert_json: ... geoip=/usr/local/share/GeoIP/GeoIP.dat ... + If you want “alert_json†print geo­localization information too, you have to compile barnyard with geo­ip support: -./configure ­­--enable-geo-ip - +./configure ­­--enable-geo-ip. + +You have to specify the params you want in the template too. See template params for more details. + + 4 Template params +You can modify the template using param= argument. If you don't put 'param=', the default template +will print all of them. Note that not all template params have the same name in the json output. + +timestamp: event timestamp +sensor_id: sensor id specified in args (e.g. 'output alert_json: sensor_id=4') +sensor_id_snort: sensor id given by snort +sig_generator: +sig_id: +sig_rev: +priority: +classification: Alert classification (see snort classification.config file) +msg: Alert message +payload: Payload of the message ("-" printed if none) +proto: Protocol of the message ("tcp", "udp",...). "-" will be printed if no protocols file defined. +proto_id: Numeric field of protocol. +src: Source in number format. E.g. "src":134744072, +src_str: Source in string format. E. g. "src_str":"8.8.8.8" +src_name: Source name. Example: "src_name":"google-1st-nameserver" (See "Host and network name resoution") +src_net: Source net. Example: "src_net":"8.8.0.0/16 (See "Host and network name resolution") +src_net_name: Source net name. Example: "google-net" (See "Host and network name resolution") +dst, dst_name, dst_str, dst_net, dst_net_name: Same as src_* ones. +src_country, dst_country: Source and destination country, e.g.: "United States". See "GeoIP" section. +src_country_code. dst_country_code: Source and destination country code, e.g.: "US". See "GeoIP" section. +srcport,dstport: Source and destination layer 4 port, if aviable. +ethsrc, ethdst: Ethernet source and destination address. +ethlen: Ethernet packet lenght. +tcpflags: TCP flags. +tcpseq: TCP Sequence number. +tcpack: TCP ACK number. +tcplen: TCP lenght. +tcpwindow: TCP congestion window size. +id: IP header id field. +dgmlen: IP header lenght. +ttl: Time-to-live. +tos: TOS. +iplen: IP lenght of packet. +icmptype: ICMP type. +icmpcode: ICMP code. +icmpid: ICMP id. +icmpseq: ICMP sequence number. \ No newline at end of file diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index e2b70ff..31357f3 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -525,8 +525,15 @@ static bool inline LogJSON_a(KafkaLog *kafka,const char *fieldName,const char *f } /* - * A faster replacement for inet_ntoa(). - * Extracted from tcpdump + * Function: _intoa(unsigned int addr, char* buf, u_short bufLen) + * + * Purpose: A faster replacement for inet_ntoa().Extracted from tcpdump + * + * Arguments: addr => Numeric address. + * buf => Buffer to save string format address. + * bufLen => buf's length. + * + * Returns: Position of buffer where string starts. */ char* _intoa(unsigned int addr, char* buf, u_short bufLen) { char *cp, *retStr; @@ -560,14 +567,14 @@ char* _intoa(unsigned int addr, char* buf, u_short bufLen) { /* * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) * - * Purpose: Write a user defined JSON message + * Purpose: Write a user defined JSON element. * - * Arguments: p => packet. (could be NULL) - * msg => the message to send - * args => JSON output arguements - * numargs => number of arguements - * log => Log - * Returns: void function + * Arguments: p => packet. (could be NULL) + * event => event that cause the alarm. + * event_type => event type. + * jsonData => main plugin data. + * templateElement => template element with format. + * Returns: 0 if nothing writed to jsonData. !=0 otherwise. * */ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement){ @@ -916,11 +923,10 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type * * Purpose: Write a user defined JSON message * - * Arguments: p => packet. (could be NULL) - * msg => the message to send - * args => JSON output arguements - * numargs => number of arguements - * log => Log + * Arguments: p => packet. (could be NULL) + * event => event. + * event_type => event type + * json_data => plugin main data * Returns: void function * */ diff --git a/src/rbutil/rb_numstrpair_list.h b/src/rbutil/rb_numstrpair_list.h index 0f3c353..438fc34 100644 --- a/src/rbutil/rb_numstrpair_list.h +++ b/src/rbutil/rb_numstrpair_list.h @@ -32,14 +32,13 @@ #include "sf_ip.h" typedef struct _Number_str_assoc{ - char * human_readable_str; - char * number_as_str; + char * human_readable_str; /* Example: Google, tcp, ssh... */ + char * number_as_str; /* Example: 8.8.8.8, 0x800, 22... String format*/ union{sfip_t ip;uint16_t service;uint16_t protocol;} number; struct _Number_str_assoc * next; } Number_str_assoc; -/* Enumeration for FillHostList - */ +/* Enumeration for FillHostList */ typedef enum{HOSTS,NETWORKS,SERVICES,PROTOCOLS} FILLHOSTSLIST_MODE; void freeNumberStrAssocList(Number_str_assoc * nstrList); From 38f3cac38995c188b9cf26b1c11f7be7cce4108f Mon Sep 17 00:00:00 2001 From: eugenio Date: Sat, 13 Jul 2013 11:31:30 +0000 Subject: [PATCH 055/198] Proto fallback value is now the same value as proto_id --- src/output-plugins/spo_alert_json.c | 158 ++++++++++++++-------------- src/output-plugins/spo_alert_json.h | 8 -- src/rbutil/rb_kafka.c | 1 + 3 files changed, 82 insertions(+), 85 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 31357f3..1781bba 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,7 +77,7 @@ #endif // HAVE_GEOIP -#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" @@ -93,67 +93,70 @@ #define FIELD_NAME_VALUE_SEPARATOR ": " #define JSON_FIELDS_SEPARATOR ", " -#define TIMESTAMP 1 -#define SENSOR_ID_SNORT 2 -#define SENSOR_ID 3 -#define SENSOR_NAME 4 -#define SIG_GENERATOR 5 -#define SIG_ID 6 -#define SIG_REV 7 -#define PRIORITY 8 -#define CLASSIFICATION 9 -#define MSG 10 -#define PAYLOAD 11 -#define PROTO 12 -#define PROTO_ID 13 -#define ETHSRC 14 -#define ETHDST 15 -#define ETHTYPE 16 -#define UDPLENGTH 17 -#define ETHLENGTH 18 -#define TRHEADER 19 -#define SRCPORT 20 -#define DSTPORT 21 -#define SRCPORT_NAME 22 -#define DSTPORT_NAME 23 -#define SRC_TEMPLATE_ID 24 -#define SRC_STR 25 -#define SRC_NAME 26 -#define SRC_NET 27 -#define SRC_NET_NAME 28 -#define DST_TEMPLATE_ID 29 -#define DST_NAME 30 -#define DST_STR 31 -#define DST_NET 32 -#define DST_NET_NAME 33 -#define ICMPTYPE 34 -#define ICMPCODE 35 -#define ICMPID 36 -#define ICMPSEQ 37 -#define TTL 38 -#define TOS 39 -#define ID 40 -#define IPLEN 41 -#define DGMLEN 42 -#define TCPSEQ 43 -#define TCPACK 44 -#define TCPLEN 45 -#define TCPWINDOW 46 -#define TCPFLAGS 47 +/* If you change some of this, remember to change printElementWithTemplate too */ +typedef enum{ + TIMESTAMP, + SENSOR_ID_SNORT, + SENSOR_ID, + SENSOR_NAME, + SIG_GENERATOR, + SIG_ID, + SIG_REV, + PRIORITY, + CLASSIFICATION, + MSG, + PAYLOAD, + PROTO, + PROTO_ID, + ETHSRC, + ETHDST, + ETHTYPE, + UDPLENGTH, + ETHLENGTH, + TRHEADER, + SRCPORT, + DSTPORT, + SRCPORT_NAME, + DSTPORT_NAME, + SRC_TEMPLATE_ID, + SRC_STR, + SRC_NAME, + SRC_NET, + SRC_NET_NAME, + DST_TEMPLATE_ID, + DST_NAME, + DST_STR, + DST_NET, + DST_NET_NAME, + ICMPTYPE, + ICMPCODE, + ICMPID, + ICMPSEQ, + TTL, + TOS, + ID, + IPLEN, + DGMLEN, + TCPSEQ, + TCPACK, + TCPLEN, + TCPWINDOW, + TCPFLAGS, #ifdef HAVE_GEOIP -#define SRC_COUNTRY 48 -#define DST_COUNTRY 49 -#define SRC_COUNTRY_CODE 50 -#define DST_COUNTRY_CODE 51 + SRC_COUNTRY, + DST_COUNTRY, + SRC_COUNTRY_CODE, + DST_COUNTRY_CODE, #endif // HAVE_GEOIP -#define TEMPLATE_END_ID 52 /* Remember to update it if some template element is added */ + TEMPLATE_END_ID +}TEMPLATE_ID; typedef enum{stringFormat,numericFormat} JsonPrintFormat; typedef struct{ - const uint32_t id; + const TEMPLATE_ID id; const char * templateName; const char * jsonName; const JsonPrintFormat printFormat; @@ -473,6 +476,7 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) if(data->kafka) KafkaLog_Term(data->kafka); free(data->jsonargs); + free(data->sensor_name); freeNumberStrAssocList(data->hosts); freeNumberStrAssocList(data->nets); freeNumberStrAssocList(data->services); @@ -612,6 +616,8 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type #endif ipv4 = GET_DST_ADDR(p).s_addr; break; + default: + break; }; } @@ -682,11 +688,12 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case PROTO: if(IPH_IS_VALID(p)){ Number_str_assoc * service_name_asoc = SearchNumberStr(GET_IPH_PROTO(p),jsonData->protocols,PROTOCOLS); - KafkaLog_Print(kafka,"%s",service_name_asoc?service_name_asoc->human_readable_str:(const char *)templateElement->defaultValue); - }else{ /* Always log something */ - KafkaLog_Print(kafka,"%s",(const char *)templateElement->defaultValue); + if(service_name_asoc){ + KafkaLog_Print(kafka,"%s",service_name_asoc->human_readable_str); + break; + } // Else: print PROTO_ID } - break; + /* don't break! */ case PROTO_ID: KafkaLog_Print(kafka,"%"PRIu16,IPH_IS_VALID(p)?GET_IPH_PROTO(p):0); break; @@ -727,8 +734,8 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type } break; - case SRCPORT: - case DSTPORT: + case SRCPORT_NAME: + case DSTPORT_NAME: if(IPH_IS_VALID(p)) { switch(GET_IPH_PROTO(p)) @@ -736,19 +743,18 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case IPPROTO_UDP: case IPPROTO_TCP: { - KafkaLog_Print(kafka,"%"PRIu16,templateElement->id==SRCPORT? p->sp:p->dp); + const uint16_t port = templateElement->id==SRCPORT_NAME? p->sp:p->dp; + Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services,SERVICES); + if(service_name_asoc) + KafkaLog_Print(kafka,"%s",service_name_asoc->human_readable_str); + else /* Log port number */ + KafkaLog_Print(kafka,"%"PRIu16,templateElement->id==SRCPORT_NAME? p->sp:p->dp); } - break; - default: /* Always log something */ - KafkaLog_Print(kafka,"%"PRIu16,0); - break; - } - }else{ /* Always Log something */ - KafkaLog_Print(kafka,"%"PRIu16,0); + break; + }; } - break; - case SRCPORT_NAME: - case DSTPORT_NAME: + case SRCPORT: + case DSTPORT: if(IPH_IS_VALID(p)) { switch(GET_IPH_PROTO(p)) @@ -756,17 +762,15 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case IPPROTO_UDP: case IPPROTO_TCP: { - const uint16_t port = templateElement->id==SRCPORT_NAME? p->sp:p->dp; - Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services,SERVICES); - KafkaLog_Print(kafka,"%s",service_name_asoc?service_name_asoc->human_readable_str:(const char *)templateElement->defaultValue); + KafkaLog_Print(kafka,"%"PRIu16,templateElement->id==SRCPORT? p->sp:p->dp); } break; default: /* Always log something */ - KafkaLog_Print(kafka,"%s",(const char *)templateElement->defaultValue); + KafkaLog_Print(kafka,"%"PRIu16,0); break; - }; + } }else{ /* Always Log something */ - KafkaLog_Print(kafka,"%s",(const char *)templateElement->defaultValue); + KafkaLog_Print(kafka,"%"PRIu16,0); } break; diff --git a/src/output-plugins/spo_alert_json.h b/src/output-plugins/spo_alert_json.h index ed0a852..6e52669 100644 --- a/src/output-plugins/spo_alert_json.h +++ b/src/output-plugins/spo_alert_json.h @@ -19,14 +19,6 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id$ */ - -/* This file gets included in plugbase.h when it is integrated into the rest - * of the program. Sometime in The Future, I'll whip up a bad ass Perl script - * to handle automatically loading all the required info into the plugbase.* - * files. - */ - #ifndef __SPO_JSON_H__ #define __SPO_JSON_H__ diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index 483920b..b60d2d8 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -148,6 +148,7 @@ void KafkaLog_Term (KafkaLog* this) free(this->buf); if ( this->broker ) free(this->broker); + if ( this->topic ) free(this->topic); #endif if(this->textLog) TextLog_Term(this->textLog); From 262c850e0e4728a117ae32bafda243bc4c322ea3 Mon Sep 17 00:00:00 2001 From: eugenio Date: Mon, 15 Jul 2013 09:53:00 +0000 Subject: [PATCH 056/198] Added ARP and VLAN parsing. --- doc/README.alert_json | 7 ++++ src/output-plugins/spo_alert_json.c | 62 ++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/doc/README.alert_json b/doc/README.alert_json index 0f36fde..c5b28fc 100644 --- a/doc/README.alert_json +++ b/doc/README.alert_json @@ -86,6 +86,13 @@ src_country_code. dst_country_code: Source and destination country code, e.g.: " srcport,dstport: Source and destination layer 4 port, if aviable. ethsrc, ethdst: Ethernet source and destination address. ethlen: Ethernet packet lenght. +arp_hw_saddr: sender hardware address +arp_hw_sprot: sender protocol address +arp_hw_daddr: target hardware address +arp_hw_dprot: target protocol address +vlan: Vlan tag +vlan_priority: Vlan packet priority +vlan_drop: DEI tag of vlan field tcpflags: TCP flags. tcpseq: TCP Sequence number. tcpack: TCP ACK number. diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 1781bba..3208e0c 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,7 +77,7 @@ #endif // HAVE_GEOIP -#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" @@ -111,6 +111,13 @@ typedef enum{ ETHSRC, ETHDST, ETHTYPE, + VLAN, /* See vlan header */ + VLAN_PRIORITY, + VLAN_DROP, + ARP_HW_SADDR, /* Sender ARP Hardware Address */ + ARP_HW_SPROT, /* Sender ARP Hardware Protocol */ + ARP_HW_TADDR, /* Destination ARP Hardware Address */ + ARP_HW_TPROT, /* Destination ARP Hardware Protocol */ UDPLENGTH, ETHLENGTH, TRHEADER, @@ -205,6 +212,13 @@ static AlertJSONTemplateElement template[] = { {ETHSRC,"ethsrc","ethsrc",stringFormat,"-"}, {ETHDST,"ethdst","ethdst",stringFormat,"-"}, {ETHTYPE,"ethtype","ethtype",numericFormat,0}, + {ARP_HW_SADDR,"arp_hw_saddr","arp_hw_saddr",stringFormat,"-"}, + {ARP_HW_SPROT,"arp_hw_sprot","arp_hw_sprot",stringFormat,"-"}, + {ARP_HW_TADDR,"arp_hw_taddr","arp_hw_taddr",stringFormat,"-"}, + {ARP_HW_TPROT,"arp_hw_tprot","arp_hw_tprot",stringFormat,"-"}, + {VLAN,"vlan","vlan",numericFormat,0}, + {VLAN_PRIORITY,"vlan_priority","vlan_priority",numericFormat,0}, + {VLAN_DROP,"vlan_drop","vlan_drop",numericFormat,0}, {UDPLENGTH,"udplength","udplength",numericFormat,0}, {ETHLENGTH,"ethlen","ethlength",numericFormat,0}, {TRHEADER,"trheader","trheader",stringFormat,"-"}, @@ -716,6 +730,39 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type } break; + case ARP_HW_SADDR: + if(p->ah) + { + KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X",p->ah->arp_sha[0], + p->ah->arp_sha[1],p->ah->arp_sha[2],p->ah->arp_sha[3], + p->ah->arp_sha[4],p->ah->arp_sha[5]); + } + break; + case ARP_HW_SPROT: + if(p->ah) + { + KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X",p->ah->arp_spa[0], + p->ah->arp_spa[1],p->ah->arp_spa[2],p->ah->arp_spa[3], + p->ah->arp_spa[4],p->ah->arp_spa[5]); + } + break; + case ARP_HW_TADDR: + if(p->ah) + { + KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X",p->ah->arp_tha[0], + p->ah->arp_tha[1],p->ah->arp_tha[2],p->ah->arp_tha[3], + p->ah->arp_tha[4],p->ah->arp_tha[5]); + } + break; + case ARP_HW_TPROT: + if(p->ah) + { + KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X",p->ah->arp_tpa[0], + p->ah->arp_tpa[1],p->ah->arp_tpa[2],p->ah->arp_tpa[3], + p->ah->arp_tpa[4],p->ah->arp_tpa[5]); + } + break; + case ETHTYPE: if(p->eh) { @@ -734,6 +781,19 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type } break; + case VLAN_PRIORITY: + if(p->vh) + KafkaLog_Print(kafka,"%"PRIu16,VTH_PRIORITY(p->vh)); + break; + case VLAN_DROP: + if(p->vh) + KafkaLog_Print(kafka,"%"PRIu8,VTH_CFI(p->vh)); + break; + case VLAN: + if(p->vh) + KafkaLog_Print(kafka,"%"PRIu8,VTH_VLAN(p->vh)); + break; + case SRCPORT_NAME: case DSTPORT_NAME: if(IPH_IS_VALID(p)) From f8519e9996475484ca1e99b8379f9322eddf7105 Mon Sep 17 00:00:00 2001 From: eugenio Date: Mon, 15 Jul 2013 11:37:54 +0000 Subject: [PATCH 057/198] Resolved VLAN names. --- doc/README.alert_json | 12 ++++++---- src/output-plugins/spo_alert_json.c | 34 +++++++++++++++++++---------- src/rbutil/rb_numstrpair_list.c | 10 ++++++--- src/rbutil/rb_numstrpair_list.h | 4 ++-- 4 files changed, 40 insertions(+), 20 deletions(-) diff --git a/doc/README.alert_json b/doc/README.alert_json index c5b28fc..95ce7ab 100644 --- a/doc/README.alert_json +++ b/doc/README.alert_json @@ -32,21 +32,24 @@ alert_json can print the destination or source network of the packet. You have t in “/etc/barnyard_networks†indicating this. For example, the entry “192.168.100.0/24 foo network†will make alert_json print the network name and the network id. In case alert_json does not locate the network in the file, it will print “0.0.0.0/0†instead. Alert_json can do the same -function to services and protocol names, reading it from /etc/services and /etc/protocols files. +function to services and protocols names, reading it from /etc/services and /etc/protocols files. If you want to use these functions, you have to specify these files in plugin's params: output alert_json: ... hosts=/etc/hosts networks=/etc/networks services=/etc/services protocols=/etc/protocols ... -And you have to be sure they are in the template. The default template has it, but if you don't +You have to be sure they are in the template. The default template has it, but if you don't specify the files, it will always print "0", "0.0.0.0" or "0.0.0.0/0". +Also, alert_json can print the vlan names, reading from a file with the same format at /etc/protocols. +The argument is vlans=/path/to/file. + The output names are: src_name, dst_name, src_net, src_net_name, dst_net, dst_net_name, proto, -proto_id, srcport_name, dstport_name. +proto_id, srcport_name, dstport_name,vlan_name. - 3 GeoIP + 3 GeoIP Alert_json can locate the region of the IP too. You just have to have libGeoIP installed and compile the sources with GEO_IP macro defined (it's defined by default). Also, you have to specify the database location in json arguments, for example: @@ -91,6 +94,7 @@ arp_hw_sprot: sender protocol address arp_hw_daddr: target hardware address arp_hw_dprot: target protocol address vlan: Vlan tag +vlan_name: (See host and network name resolution) vlan_priority: Vlan packet priority vlan_drop: DEI tag of vlan field tcpflags: TCP flags. diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 3208e0c..10466af 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,7 +77,7 @@ #endif // HAVE_GEOIP -#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" @@ -112,6 +112,7 @@ typedef enum{ ETHDST, ETHTYPE, VLAN, /* See vlan header */ + VLAN_NAME, VLAN_PRIORITY, VLAN_DROP, ARP_HW_SADDR, /* Sender ARP Hardware Address */ @@ -186,7 +187,7 @@ typedef struct _AlertJSONData char * jsonargs; TemplateElementsList * outputTemplate; AlertJSONConfig *config; - Number_str_assoc * hosts, *nets, *services, *protocols; + Number_str_assoc * hosts, *nets, *services, *protocols, *vlans; uint64_t sensor_id; char * sensor_name; #ifdef HAVE_GEOIP @@ -217,6 +218,7 @@ static AlertJSONTemplateElement template[] = { {ARP_HW_TADDR,"arp_hw_taddr","arp_hw_taddr",stringFormat,"-"}, {ARP_HW_TPROT,"arp_hw_tprot","arp_hw_tprot",stringFormat,"-"}, {VLAN,"vlan","vlan",numericFormat,0}, + {VLAN_NAME,"vlan_name","vlan_name",stringFormat,0}, {VLAN_PRIORITY,"vlan_priority","vlan_priority",numericFormat,0}, {VLAN_DROP,"vlan_drop","vlan_drop",numericFormat,0}, {UDPLENGTH,"udplength","udplength",numericFormat,0}, @@ -340,10 +342,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) char* filename = NULL; char* kafka_str = NULL; int i; - char* hostsListPath = NULL; - char* networksPath = NULL; - char* servicesPath = NULL; - char* protocolsPath = NULL; + char* hostsListPath = NULL,*networksPath = NULL,*servicesPath = NULL,*protocolsPath = NULL,*vlansPath=NULL; #ifdef HAVE_GEOIP char * geoIP_path = NULL; #endif @@ -383,6 +382,8 @@ static AlertJSONData *AlertJSONParseArgs(char *args) servicesPath = SnortStrdup(tok+strlen("services=")); }else if(!strncasecmp(tok,"protocols=",strlen("protocols="))){ protocolsPath = SnortStrdup(tok+strlen("protocols=")); + }else if(!strncasecmp(tok,"vlans=",strlen("vlans"))){ + vlansPath = SnortStrdup(tok+strlen("vlans=")); }else if(!strncasecmp(tok,"start_partition=",strlen("start_partition="))){ start_partition = end_partition = atol(tok+strlen("start_partition=")); }else if(!strncasecmp(tok,"end_partition=",strlen("end_partition="))){ @@ -402,10 +403,13 @@ static AlertJSONData *AlertJSONParseArgs(char *args) if ( !data->sensor_name ) data->sensor_name = SnortStrdup("-"); if ( !filename ) filename = ProcessFileOption(barnyard2_conf_for_parsing, DEFAULT_FILE); if ( !kafka_str ) kafka_str = SnortStrdup(DEFAULT_KAFKA_BROKER); + + /* names-str assoc */ if(hostsListPath) FillHostsList(hostsListPath,&data->hosts,HOSTS); if(networksPath) FillHostsList(networksPath,&data->nets,NETWORKS); if(servicesPath) FillHostsList(servicesPath,&data->services,SERVICES); if(protocolsPath) FillHostsList(protocolsPath,&data->protocols,PROTOCOLS); + if(vlansPath) FillHostsList(vlansPath,&data->vlans,VLANS); mSplitFree(&toks, num_toks); toks = mSplit(data->jsonargs, ",", 128, &num_toks, 0); @@ -470,6 +474,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) if( networksPath ) free (networksPath); if( servicesPath ) free (servicesPath); if( protocolsPath ) free (protocolsPath); + if( vlansPath ) free(vlansPath); #ifdef HAVE_GEOIP if (geoIP_path) free(geoIP_path); #endif @@ -495,6 +500,7 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) freeNumberStrAssocList(data->nets); freeNumberStrAssocList(data->services); freeNumberStrAssocList(data->protocols); + freeNumberStrAssocList(data->vlans); for(iter=data->outputTemplate;iter;iter=aux){ aux = iter->next; free(iter); @@ -791,7 +797,16 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; case VLAN: if(p->vh) - KafkaLog_Print(kafka,"%"PRIu8,VTH_VLAN(p->vh)); + KafkaLog_Print(kafka,"%"PRIu16,VTH_VLAN(p->vh)); + break; + case VLAN_NAME: + if(p->vh){ + Number_str_assoc * service_name_asoc = SearchNumberStr(VTH_VLAN(p->vh),jsonData->vlans,VLANS); + if(service_name_asoc) + KafkaLog_Print(kafka,"%s",service_name_asoc->human_readable_str); + else + KafkaLog_Print(kafka,"%"PRIu16,VTH_VLAN(p->vh)); + } break; case SRCPORT_NAME: @@ -821,9 +836,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type { case IPPROTO_UDP: case IPPROTO_TCP: - { KafkaLog_Print(kafka,"%"PRIu16,templateElement->id==SRCPORT? p->sp:p->dp); - } break; default: /* Always log something */ KafkaLog_Print(kafka,"%"PRIu16,0); @@ -974,8 +987,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; default: - *(int *)NULL = 0; - FatalError("Template id %d not found",templateElement->id); /* just for sanity */ + FatalError("Template id %d not found (line %d)\n",templateElement->id,__LINE__); break; }; diff --git a/src/rbutil/rb_numstrpair_list.c b/src/rbutil/rb_numstrpair_list.c index cdc762b..fb5d1e6 100644 --- a/src/rbutil/rb_numstrpair_list.c +++ b/src/rbutil/rb_numstrpair_list.c @@ -87,12 +87,15 @@ static Number_str_assoc * FillHostList_Node(char *line_buffer, FILLHOSTSLIST_MOD node=NULL; } } - break; + break; case SERVICES: node->number.protocol = atoi(node->number_as_str); - break; + break; case PROTOCOLS: node->number.service = atoi(node->number_as_str); + break; + case VLANS: + node->number.vlan = atoi(node->number_as_str); break; }; mSplitFree(&toks, num_toks); @@ -167,8 +170,9 @@ Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *iplis break; case SERVICES: case PROTOCOLS: + case VLANS: for(node=(Number_str_assoc *)iplist;node;node=node->next){ - if(node->number.service /* same as .protocol*/ == number) + if(node->number.service /* same as .protocol or .vlan*/ == number) break; } break; diff --git a/src/rbutil/rb_numstrpair_list.h b/src/rbutil/rb_numstrpair_list.h index 438fc34..3a2129c 100644 --- a/src/rbutil/rb_numstrpair_list.h +++ b/src/rbutil/rb_numstrpair_list.h @@ -34,12 +34,12 @@ typedef struct _Number_str_assoc{ char * human_readable_str; /* Example: Google, tcp, ssh... */ char * number_as_str; /* Example: 8.8.8.8, 0x800, 22... String format*/ - union{sfip_t ip;uint16_t service;uint16_t protocol;} number; + union{sfip_t ip;uint16_t service, protocol,vlan;} number; struct _Number_str_assoc * next; } Number_str_assoc; /* Enumeration for FillHostList */ -typedef enum{HOSTS,NETWORKS,SERVICES,PROTOCOLS} FILLHOSTSLIST_MODE; +typedef enum{HOSTS,NETWORKS,SERVICES,PROTOCOLS,VLANS} FILLHOSTSLIST_MODE; void freeNumberStrAssocList(Number_str_assoc * nstrList); void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOSTSLIST_MODE mode); From 8fd7109408e7f798d827d56e38a0f3536ccd3985 Mon Sep 17 00:00:00 2001 From: eugenio Date: Tue, 16 Jul 2013 06:55:52 +0000 Subject: [PATCH 058/198] FIX: ipv4 were not passed by ntohl functions --- src/output-plugins/spo_alert_json.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 10466af..6c70c5e 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,7 +77,7 @@ #endif // HAVE_GEOIP -#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,sensor_name,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" @@ -622,7 +622,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case SRC_COUNTRY: case SRC_COUNTRY_CODE: #endif - ipv4 = GET_SRC_ADDR(p).s_addr; + ipv4 = ntohl(GET_SRC_ADDR(p).s_addr); break; case DST_TEMPLATE_ID: @@ -634,7 +634,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case DST_COUNTRY: case DST_COUNTRY_CODE: #endif - ipv4 = GET_DST_ADDR(p).s_addr; + ipv4 = ntohl(GET_DST_ADDR(p).s_addr); break; default: break; From fcdbe8f5b9c4e64346ddf7b8b6cb65bf5a6f7493 Mon Sep 17 00:00:00 2001 From: eugenio Date: Wed, 17 Jul 2013 08:14:38 +0000 Subject: [PATCH 059/198] Deleted all slow KafkaLog_Print and changed to KafkaLog_Puts. Added a _itoa function to convert number to string. Template default values changed from void* to char* --- src/output-plugins/spo_alert_json.c | 301 ++++++++++++++-------------- 1 file changed, 155 insertions(+), 146 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 6c70c5e..bd939ed 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -168,7 +168,7 @@ typedef struct{ const char * templateName; const char * jsonName; const JsonPrintFormat printFormat; - void * defaultValue; + char * defaultValue; } AlertJSONTemplateElement; typedef struct _TemplateElementsList{ @@ -192,65 +192,65 @@ typedef struct _AlertJSONData char * sensor_name; #ifdef HAVE_GEOIP GeoIP *gi; -#endif +#endif } AlertJSONData; /* Remember update printElementWithTemplate if some element modified here */ static AlertJSONTemplateElement template[] = { - {TIMESTAMP,"timestamp","event_timestamp",numericFormat,0}, - {SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat,0}, - {SENSOR_ID,"sensor_id","sensor_id",numericFormat,0}, + {TIMESTAMP,"timestamp","event_timestamp",numericFormat,"0"}, + {SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat,"0"}, + {SENSOR_ID,"sensor_id","sensor_id",numericFormat,"0"}, {SENSOR_NAME,"sensor_name","sensor_name",stringFormat,"-"}, - {SIG_GENERATOR,"sig_generator","sig_generator",numericFormat,0}, - {SIG_ID,"sig_id","sig_id",numericFormat,0}, - {SIG_REV,"sig_rev","rev",numericFormat,0}, - {PRIORITY,"priority","priority",numericFormat,0}, + {SIG_GENERATOR,"sig_generator","sig_generator",numericFormat,"0"}, + {SIG_ID,"sig_id","sig_id",numericFormat,"0"}, + {SIG_REV,"sig_rev","rev",numericFormat,"0"}, + {PRIORITY,"priority","priority",numericFormat,"0"}, {CLASSIFICATION,"classification","classification",stringFormat,"-"}, {MSG,"msg","msg",stringFormat,"-"}, {PAYLOAD,"payload","payload",stringFormat,"-"}, {PROTO,"proto","proto",stringFormat,"-"}, - {PROTO_ID,"proto_id","proto_id",numericFormat,0}, + {PROTO_ID,"proto_id","proto_id",numericFormat,"0"}, {ETHSRC,"ethsrc","ethsrc",stringFormat,"-"}, {ETHDST,"ethdst","ethdst",stringFormat,"-"}, - {ETHTYPE,"ethtype","ethtype",numericFormat,0}, + {ETHTYPE,"ethtype","ethtype",numericFormat,"0"}, {ARP_HW_SADDR,"arp_hw_saddr","arp_hw_saddr",stringFormat,"-"}, {ARP_HW_SPROT,"arp_hw_sprot","arp_hw_sprot",stringFormat,"-"}, {ARP_HW_TADDR,"arp_hw_taddr","arp_hw_taddr",stringFormat,"-"}, {ARP_HW_TPROT,"arp_hw_tprot","arp_hw_tprot",stringFormat,"-"}, - {VLAN,"vlan","vlan",numericFormat,0}, - {VLAN_NAME,"vlan_name","vlan_name",stringFormat,0}, - {VLAN_PRIORITY,"vlan_priority","vlan_priority",numericFormat,0}, - {VLAN_DROP,"vlan_drop","vlan_drop",numericFormat,0}, - {UDPLENGTH,"udplength","udplength",numericFormat,0}, - {ETHLENGTH,"ethlen","ethlength",numericFormat,0}, + {VLAN,"vlan","vlan",numericFormat,"0"}, + {VLAN_NAME,"vlan_name","vlan_name",stringFormat,"0"}, + {VLAN_PRIORITY,"vlan_priority","vlan_priority",numericFormat,"0"}, + {VLAN_DROP,"vlan_drop","vlan_drop",numericFormat,"0"}, + {UDPLENGTH,"udplength","udplength",numericFormat,"0"}, + {ETHLENGTH,"ethlen","ethlength",numericFormat,"0"}, {TRHEADER,"trheader","trheader",stringFormat,"-"}, - {SRCPORT,"srcport","srcport",numericFormat,0}, + {SRCPORT,"srcport","srcport",numericFormat,"0"}, {SRCPORT_NAME,"srcport_name","srcport_name",stringFormat,"-"}, - {DSTPORT,"dstport","dstport",numericFormat,0}, + {DSTPORT,"dstport","dstport",numericFormat,"0"}, {DSTPORT_NAME,"dstport_name","dstport_name",stringFormat,"-"}, - {SRC_TEMPLATE_ID,"src","src",numericFormat,0}, + {SRC_TEMPLATE_ID,"src","src",numericFormat,"0"}, {SRC_STR,"src_str","src_str",stringFormat,"-"}, {SRC_NAME,"src_name","src_name",stringFormat,"-"}, {SRC_NET,"src_net","src_net",stringFormat,"0.0.0.0/0"}, {SRC_NET_NAME,"src_net_name","src_net_name",stringFormat,"0.0.0.0/0"}, - {DST_TEMPLATE_ID,"dst","dst",numericFormat,0}, + {DST_TEMPLATE_ID,"dst","dst",numericFormat,"0"}, {DST_NAME,"dst_name","dst_name",stringFormat,"-"}, {DST_STR,"dst_str","dst_str",stringFormat,"-"}, {DST_NET,"dst_net","dst_net",stringFormat,"0.0.0.0/0"}, {DST_NET_NAME,"dst_net_name","dst_net_name",stringFormat,"0.0.0.0/0"}, - {ICMPTYPE,"icmptype","icmptype",numericFormat,0}, - {ICMPCODE,"icmpcode","icmpcode",numericFormat,0}, - {ICMPID,"icmpid","icmpid",numericFormat,0}, - {ICMPSEQ,"icmpseq","icmpseq",numericFormat,0}, - {TTL,"ttl","ttl",numericFormat,0}, - {TOS,"tos","tos",numericFormat,0}, - {ID,"id","id",numericFormat,0}, - {IPLEN,"iplen","iplen",numericFormat,0}, - {DGMLEN,"dgmlen","dgmlen",numericFormat,0}, - {TCPSEQ,"tcpseq","tcpseq",numericFormat,0}, - {TCPACK,"tcpack","tcpack",numericFormat,0}, - {TCPLEN,"tcplen","tcplen",numericFormat,0}, - {TCPWINDOW,"tcpwindow","tcpwindow",numericFormat,0}, + {ICMPTYPE,"icmptype","icmptype",numericFormat,"0"}, + {ICMPCODE,"icmpcode","icmpcode",numericFormat,"0"}, + {ICMPID,"icmpid","icmpid",numericFormat,"0"}, + {ICMPSEQ,"icmpseq","icmpseq",numericFormat,"0"}, + {TTL,"ttl","ttl",numericFormat,"0"}, + {TOS,"tos","tos",numericFormat,"0"}, + {ID,"id","id",numericFormat,"0"}, + {IPLEN,"iplen","iplen",numericFormat,"0"}, + {DGMLEN,"dgmlen","dgmlen",numericFormat,"0"}, + {TCPSEQ,"tcpseq","tcpseq",numericFormat,"0"}, + {TCPACK,"tcpack","tcpack",numericFormat,"0"}, + {TCPLEN,"tcplen","tcplen",numericFormat,"0"}, + {TCPWINDOW,"tcpwindow","tcpwindow",numericFormat,"0"}, {TCPFLAGS,"tcpflags","tcpflags",stringFormat,"-"}, #ifdef HAVE_GEOIP {SRC_COUNTRY,"src_country","src_country",stringFormat,"N/A"}, @@ -258,7 +258,7 @@ static AlertJSONTemplateElement template[] = { {SRC_COUNTRY_CODE,"src_country_code","src_country_code",stringFormat,"N/A"}, {DST_COUNTRY_CODE,"dst_country_code","dst_country_code",stringFormat,"N/A"}, #endif /* HAVE_GEOIP */ - {TEMPLATE_END_ID,"","",numericFormat,0} + {TEMPLATE_END_ID,"","",numericFormat,"0"} }; /* list of function prototypes for this preprocessor */ @@ -531,23 +531,6 @@ static void AlertJSON(Packet *p, void *event, uint32_t event_type, void *arg) AlertJSONData *data = (AlertJSONData *)arg; RealAlertJSON(p, event, event_type, data); } - -static bool inline PrintJSONFieldName(KafkaLog * kafka,const char *fieldName){ - return KafkaLog_Quote(kafka,fieldName) && KafkaLog_Puts(kafka,FIELD_NAME_VALUE_SEPARATOR); -} - -static bool inline LogJSON_int(KafkaLog * kafka, const char * fieldName,uint64_t fieldValue,char * fmt){ - return PrintJSONFieldName(kafka,fieldName) && KafkaLog_Print(kafka,fmt,fieldValue); -} - -static bool inline LogJSON_a(KafkaLog *kafka,const char *fieldName,const char *fieldValue){ - bool aok = 1; - if(aok) aok = KafkaLog_Quote(kafka,fieldName); - if(aok) aok = KafkaLog_Puts(kafka,FIELD_NAME_VALUE_SEPARATOR); - if(aok) aok = KafkaLog_Quote(kafka,fieldValue); - return aok; -} - /* * Function: _intoa(unsigned int addr, char* buf, u_short bufLen) * @@ -588,6 +571,50 @@ char* _intoa(unsigned int addr, char* buf, u_short bufLen) { return(retStr); } +/* + * Function: C++ version 0.4 char* style "itoa", Written by Lukás Chmela. (Modified) + * + * Purpose: Fast itoa conversion. snprintf is slow. + * + * Arguments: value => Number. + * result => Where to save result + * base => Number base. + * + * Return: result + * TODO: Return writed buffer lenght. + * + */ +char* _itoa(uint64_t value, char* result, int base, size_t bufsize) { + // check that the base if valid + if (base < 2 || base > 36) { *result = '\0'; return result; } + + char *ptr = result+bufsize; + uint64_t tmp_value; + + *--ptr = '\0'; + do { + tmp_value = value; + value /= base; + *--ptr = "zyxwvutsrqponmlkjihgfedcba9876543210123456789abcdefghijklmnopqrstuvwxyz" [35 + (tmp_value - value * base)]; + } while ( value ); + + + if (tmp_value < 0) *--ptr = '-'; + return ptr; +} + +/* shortcut to used bases */ +static inline char *itoa10(uint64_t value,char *result,const size_t bufsize){return _itoa(value,result,10,bufsize);} +static inline char *itoa16(uint64_t value,char *result,const size_t bufsize){return _itoa(value,result,16,bufsize);} +static inline void printHWaddr(KafkaLog *kafka,const uint8_t *addr,char * buf,const size_t bufLen){ + int i; + for(i=0;i<6;++i){ + if(i>0) + KafkaLog_Putc(kafka,':'); + KafkaLog_Puts(kafka, itoa16(addr[i],buf,bufLen)); + } +} + /* * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) * @@ -606,6 +633,9 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type char tcpFlags[9]; char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; const size_t bufLen = sizeof buf; + char * buf_uint64 = buf; + const size_t bufLen_uint64 = bufLen; + /* sizeof "18446744073709551616" = 2^64 < sizeof buf. So it's enough with buf.*/ KafkaLog * kafka = jsonData->kafka; uint32_t ipv4 = 0; const int initial_buffer_pos = kafka->pos; @@ -643,40 +673,40 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type switch(templateElement->id){ case TIMESTAMP: - KafkaLog_Print(kafka,"%"PRIu64,p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000); + KafkaLog_Puts(kafka,itoa10(p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000, buf_uint64, bufLen_uint64)); break; case SENSOR_ID_SNORT: - KafkaLog_Print(kafka,"%"PRIu32,event?ntohl(((Unified2EventCommon *)event)->sensor_id):(uint64_t)templateElement->defaultValue); + KafkaLog_Puts(kafka,event?itoa10(ntohl(((Unified2EventCommon *)event)->sensor_id),buf_uint64, bufLen_uint64):templateElement->defaultValue); break; case SENSOR_ID: - KafkaLog_Print(kafka,"%"PRIu32,jsonData->sensor_id); + KafkaLog_Puts(kafka,itoa10(jsonData->sensor_id,buf_uint64,bufLen_uint64)); break; case SENSOR_NAME: - KafkaLog_Print(kafka,jsonData->sensor_name); + KafkaLog_Puts(kafka,jsonData->sensor_name); break; case SIG_GENERATOR: if(event != NULL) - KafkaLog_Print(kafka,"%"PRIu64,ntohl(((Unified2EventCommon *)event)->generator_id)); + KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->generator_id),buf_uint64,bufLen_uint64)); break; case SIG_ID: if(event != NULL) - KafkaLog_Print(kafka,"%"PRIu64,ntohl(((Unified2EventCommon *)event)->signature_id)); + KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->signature_id),buf_uint64,bufLen_uint64)); break; case SIG_REV: if(event != NULL) - KafkaLog_Print(kafka,"%"PRIu64,ntohl(((Unified2EventCommon *)event)->signature_revision)); + KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->signature_revision),buf_uint64,bufLen_uint64)); break; case PRIORITY: - KafkaLog_Print(kafka,"%"PRIu32, event != NULL ? ntohl(((Unified2EventCommon *)event)->priority_id) : (uint64_t)templateElement->defaultValue); + KafkaLog_Puts(kafka,event? itoa10(ntohl(((Unified2EventCommon *)event)->priority_id),buf_uint64,bufLen_uint64): templateElement->defaultValue); break; case CLASSIFICATION: if(event != NULL) { uint32_t classification_id = ntohl(((Unified2EventCommon *)event)->classification_id); const ClassType *cn = ClassTypeLookupById(barnyard2_conf, classification_id); - KafkaLog_Print(kafka,cn?cn->name:(const char *)templateElement->defaultValue); + KafkaLog_Puts(kafka,cn?cn->name:templateElement->defaultValue); }else{ /* Always log something */ - KafkaLog_Print(kafka, (const char *)templateElement->defaultValue); + KafkaLog_Puts(kafka, templateElement->defaultValue); } break; case MSG: @@ -689,7 +719,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if (sn != NULL) { //const int msglen = strlen(sn->msg); - KafkaLog_Print(kafka,sn->msg); + KafkaLog_Puts(kafka,sn->msg); } } break; @@ -698,9 +728,9 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type uint16_t i; if(p && p->dsize>0){ for(i=0;idsize;++i) - KafkaLog_Print(kafka, "%"PRIx8, p->data[i]); + KafkaLog_Puts(kafka, itoa16(p->data[i],buf_uint64,bufLen_uint64)); }else{ - KafkaLog_Puts(kafka, (const char *)templateElement->defaultValue); + KafkaLog_Puts(kafka, templateElement->defaultValue); } } break; @@ -709,103 +739,91 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(IPH_IS_VALID(p)){ Number_str_assoc * service_name_asoc = SearchNumberStr(GET_IPH_PROTO(p),jsonData->protocols,PROTOCOLS); if(service_name_asoc){ - KafkaLog_Print(kafka,"%s",service_name_asoc->human_readable_str); + KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); break; } // Else: print PROTO_ID } /* don't break! */ case PROTO_ID: - KafkaLog_Print(kafka,"%"PRIu16,IPH_IS_VALID(p)?GET_IPH_PROTO(p):0); + KafkaLog_Puts(kafka,itoa10(IPH_IS_VALID(p)?GET_IPH_PROTO(p):0,buf_uint64,bufLen_uint64)); break; case ETHSRC: if(p->eh) - { - KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X", p->eh->ether_src[0], - p->eh->ether_src[1], p->eh->ether_src[2], p->eh->ether_src[3], - p->eh->ether_src[4], p->eh->ether_src[5]); - } + printHWaddr(kafka, p->eh->ether_src, buf_uint64,bufLen_uint64); break; case ETHDST: if(p->eh) - { - KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X", p->eh->ether_dst[0], - p->eh->ether_dst[1], p->eh->ether_dst[2], p->eh->ether_dst[3], - p->eh->ether_dst[4], p->eh->ether_dst[5]); - } + printHWaddr(kafka,p->eh->ether_dst,buf_uint64,bufLen_uint64); break; case ARP_HW_SADDR: if(p->ah) - { - KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X",p->ah->arp_sha[0], - p->ah->arp_sha[1],p->ah->arp_sha[2],p->ah->arp_sha[3], - p->ah->arp_sha[4],p->ah->arp_sha[5]); - } + printHWaddr(kafka,p->ah->arp_sha,buf_uint64,bufLen_uint64); break; case ARP_HW_SPROT: if(p->ah) { - KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X",p->ah->arp_spa[0], - p->ah->arp_spa[1],p->ah->arp_spa[2],p->ah->arp_spa[3], - p->ah->arp_spa[4],p->ah->arp_spa[5]); + KafkaLog_Puts(kafka, "0x"); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[0],buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[1],buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[2],buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[3],buf_uint64,bufLen_uint64)); } break; case ARP_HW_TADDR: if(p->ah) - { - KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X",p->ah->arp_tha[0], - p->ah->arp_tha[1],p->ah->arp_tha[2],p->ah->arp_tha[3], - p->ah->arp_tha[4],p->ah->arp_tha[5]); - } + printHWaddr(kafka,p->ah->arp_tha,buf_uint64,bufLen_uint64); break; case ARP_HW_TPROT: if(p->ah) { - KafkaLog_Print(kafka, "%X:%X:%X:%X:%X:%X",p->ah->arp_tpa[0], - p->ah->arp_tpa[1],p->ah->arp_tpa[2],p->ah->arp_tpa[3], - p->ah->arp_tpa[4],p->ah->arp_tpa[5]); + KafkaLog_Puts(kafka, "0x"); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[0],buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[1],buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[2],buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[3],buf_uint64,bufLen_uint64)); } break; case ETHTYPE: if(p->eh) { - KafkaLog_Print(kafka, "%"PRIu16,ntohs(p->eh->ether_type)); + KafkaLog_Puts(kafka, itoa10(ntohs(p->eh->ether_type),buf_uint64,bufLen_uint64)); } break; case UDPLENGTH: if(p->udph){ - KafkaLog_Print(kafka, "%"PRIu16,ntohs(p->udph->uh_len)); + KafkaLog_Puts(kafka, itoa10(ntohs(p->udph->uh_len),buf_uint64,bufLen_uint64)); } break; case ETHLENGTH: if(p->eh){ - KafkaLog_Print(kafka, "%"PRIu16,p->pkth->len); + KafkaLog_Puts(kafka, itoa10(p->pkth->len,buf_uint64,bufLen_uint64)); } break; case VLAN_PRIORITY: if(p->vh) - KafkaLog_Print(kafka,"%"PRIu16,VTH_PRIORITY(p->vh)); + KafkaLog_Puts(kafka,itoa10(VTH_PRIORITY(p->vh),buf_uint64,bufLen_uint64)); break; case VLAN_DROP: if(p->vh) - KafkaLog_Print(kafka,"%"PRIu8,VTH_CFI(p->vh)); + KafkaLog_Puts(kafka,itoa10(VTH_CFI(p->vh),buf_uint64,bufLen_uint64)); break; case VLAN: if(p->vh) - KafkaLog_Print(kafka,"%"PRIu16,VTH_VLAN(p->vh)); + KafkaLog_Puts(kafka,itoa10(VTH_VLAN(p->vh),buf_uint64,bufLen_uint64)); break; case VLAN_NAME: if(p->vh){ Number_str_assoc * service_name_asoc = SearchNumberStr(VTH_VLAN(p->vh),jsonData->vlans,VLANS); if(service_name_asoc) - KafkaLog_Print(kafka,"%s",service_name_asoc->human_readable_str); + KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); else - KafkaLog_Print(kafka,"%"PRIu16,VTH_VLAN(p->vh)); + KafkaLog_Puts(kafka,itoa10(VTH_VLAN(p->vh),buf_uint64,bufLen_uint64)); } break; @@ -821,9 +839,9 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type const uint16_t port = templateElement->id==SRCPORT_NAME? p->sp:p->dp; Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services,SERVICES); if(service_name_asoc) - KafkaLog_Print(kafka,"%s",service_name_asoc->human_readable_str); + KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); else /* Log port number */ - KafkaLog_Print(kafka,"%"PRIu16,templateElement->id==SRCPORT_NAME? p->sp:p->dp); + KafkaLog_Puts(kafka,itoa10(templateElement->id==SRCPORT_NAME? p->sp:p->dp,buf_uint64,bufLen_uint64)); } break; }; @@ -836,27 +854,27 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type { case IPPROTO_UDP: case IPPROTO_TCP: - KafkaLog_Print(kafka,"%"PRIu16,templateElement->id==SRCPORT? p->sp:p->dp); + KafkaLog_Puts(kafka,itoa10(templateElement->id==SRCPORT? p->sp:p->dp,buf_uint64,bufLen_uint64)); break; default: /* Always log something */ - KafkaLog_Print(kafka,"%"PRIu16,0); + KafkaLog_Puts(kafka,templateElement->defaultValue); break; } }else{ /* Always Log something */ - KafkaLog_Print(kafka,"%"PRIu16,0); + KafkaLog_Puts(kafka,templateElement->defaultValue); } break; case SRC_TEMPLATE_ID: - KafkaLog_Print(kafka,"%"PRIu32,ipv4); + KafkaLog_Puts(kafka,itoa10(ipv4,buf_uint64,bufLen_uint64)); break; case DST_TEMPLATE_ID: - KafkaLog_Print(kafka,"%"PRIu32,ipv4); + KafkaLog_Puts(kafka,itoa10(ipv4,buf_uint64,bufLen_uint64)); break; case SRC_STR: case DST_STR: { - KafkaLog_Print(kafka,"%s",_intoa(ipv4, buf, bufLen)); + KafkaLog_Puts(kafka,_intoa(ipv4, buf, bufLen)); } break; case SRC_NAME: @@ -864,21 +882,21 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type { Number_str_assoc * ip_str_node = SearchNumberStr(ipv4,jsonData->hosts,HOSTS); const char * ip_name = ip_str_node ? ip_str_node->human_readable_str : _intoa(ipv4, buf, bufLen); - KafkaLog_Print(kafka, "%s",ip_name); + KafkaLog_Puts(kafka,ip_name); } break; case SRC_NET: case DST_NET: { Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); - KafkaLog_Print(kafka,"%s",ip_net?ip_net->number_as_str:(const char *)templateElement->defaultValue); + KafkaLog_Puts(kafka,ip_net?ip_net->number_as_str:templateElement->defaultValue); } break; case SRC_NET_NAME: case DST_NET_NAME: { Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); - KafkaLog_Print(kafka,"%s",ip_net?ip_net->human_readable_str:(const char *)templateElement->defaultValue); + KafkaLog_Puts(kafka,ip_net?ip_net->human_readable_str:templateElement->defaultValue); } break; @@ -887,33 +905,29 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case DST_COUNTRY: if(jsonData->gi){ const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); - KafkaLog_Print(kafka,"%s",country_name?country_name:(const char *)templateElement->defaultValue); + KafkaLog_Puts(kafka,country_name?country_name:templateElement->defaultValue); } break; case SRC_COUNTRY_CODE: case DST_COUNTRY_CODE: if(jsonData->gi){ const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); - KafkaLog_Print(kafka,"%s",country_code?country_code:(const char *)templateElement->defaultValue); + KafkaLog_Puts(kafka,country_code?country_code:templateElement->defaultValue); } break; #endif /* HAVE_GEOIP */ case ICMPTYPE: - if(p->icmph){ - KafkaLog_Print(kafka, "%d",p->icmph->type); - } + if(p->icmph) + KafkaLog_Puts(kafka, itoa10(p->icmph->type,buf_uint64,bufLen_uint64)); break; case ICMPCODE: if(p->icmph) - { - KafkaLog_Print(kafka, "%d",p->icmph->code); - } + KafkaLog_Puts(kafka, itoa10(p->icmph->code,buf_uint64,bufLen_uint64)); break; case ICMPID: - if(p->icmph){ - KafkaLog_Print(kafka, "%d",ntohs(p->icmph->s_icmp_id)); - } + if(p->icmph) + KafkaLog_Puts(kafka, itoa10(ntohs(p->icmph->s_icmp_id),buf_uint64,bufLen_uint64)); break; case ICMPSEQ: if(p->icmph){ @@ -921,68 +935,61 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type PrintJSONFieldName(kafka,JSON_ICMPSEQ_NAME); KafkaLog_Print(kafka, "%d",ntohs(p->icmph->s_icmp_seq)); */ - KafkaLog_Print(kafka,"%"PRIu16,ntohs(p->icmph->s_icmp_seq)); + KafkaLog_Puts(kafka,itoa10(ntohs(p->icmph->s_icmp_seq),buf_uint64,bufLen_uint64)); } break; case TTL: - if(IPH_IS_VALID(p)){ - KafkaLog_Print(kafka, "%d",GET_IPH_TTL(p)); - } + if(IPH_IS_VALID(p)) + KafkaLog_Puts(kafka,itoa10(GET_IPH_TTL(p),buf_uint64,bufLen_uint64)); break; case TOS: - if(IPH_IS_VALID(p)){ - KafkaLog_Print(kafka, "%d",GET_IPH_TOS(p)); - } + if(IPH_IS_VALID(p)) + KafkaLog_Puts(kafka,itoa10(GET_IPH_TOS(p),buf_uint64,bufLen_uint64)); break; case ID: - if(IPH_IS_VALID(p)){ - KafkaLog_Print(kafka,"%"PRIu16,IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p))); - } + if(IPH_IS_VALID(p)) + KafkaLog_Puts(kafka,itoa10(IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p)),buf_uint64,bufLen_uint64)); break; case IPLEN: - if(IPH_IS_VALID(p)){ - KafkaLog_Print(kafka, "%d",GET_IPH_LEN(p) << 2); - } + if(IPH_IS_VALID(p)) + KafkaLog_Puts(kafka,itoa10(GET_IPH_LEN(p) << 2,buf_uint64,bufLen_uint64)); break; case DGMLEN: if(IPH_IS_VALID(p)){ // XXX might cause a bug when IPv6 is printed? - KafkaLog_Print(kafka, "%d",ntohs(GET_IPH_LEN(p))); + KafkaLog_Puts(kafka, itoa10(ntohs(GET_IPH_LEN(p)),buf_uint64,bufLen_uint64)); } break; case TCPSEQ: if(p->tcph){ - // PrintJSONFieldName(kafka,JSON_TCPSEQ_NAME); // hex format // KafkaLog_Print(kafka, "lX%0x",(u_long) ntohl(p->tcph->th_ack)); // hex format - KafkaLog_Print(kafka,"%"PRIx32,ntohl(p->tcph->th_seq)); + KafkaLog_Puts(kafka,itoa16(ntohl(p->tcph->th_seq),buf_uint64,bufLen_uint64)); } break; case TCPACK: if(p->tcph){ - // PrintJSONFieldName(kafka,JSON_TCPACK_NAME); // KafkaLog_Print(kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); - KafkaLog_Print(kafka,"%"PRIx32,ntohl(p->tcph->th_ack)); + KafkaLog_Puts(kafka,itoa16(ntohl(p->tcph->th_ack),buf_uint64,bufLen_uint64)); } break; case TCPLEN: if(p->tcph){ - KafkaLog_Print(kafka, "%d",TCP_OFFSET(p->tcph) << 2); + KafkaLog_Puts(kafka, itoa10(TCP_OFFSET(p->tcph) << 2,buf_uint64,bufLen_uint64)); } break; case TCPWINDOW: if(p->tcph){ - //PrintJSONFieldName(kafka,JSON_TCPWINDOW_NAME); // hex format //KafkaLog_Print(kafka, "0x%X",ntohs(p->tcph->th_win)); // hex format - KafkaLog_Print(kafka,"%"PRIx16,ntohs(p->tcph->th_win)); + KafkaLog_Puts(kafka,itoa16(ntohs(p->tcph->th_win),buf_uint64,bufLen_uint64)); } break; case TCPFLAGS: if(p->tcph) { CreateTCPFlagString(p, tcpFlags); - KafkaLog_Quote(kafka, tcpFlags); + KafkaLog_Puts(kafka, tcpFlags); } break; @@ -1022,7 +1029,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO if(iter!=jsonData->outputTemplate) KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); - KafkaLog_Print(kafka,"\"%s\":",iter->templateElement->jsonName); + KafkaLog_Putc(kafka,'"'); + KafkaLog_Puts(kafka,iter->templateElement->jsonName); + KafkaLog_Puts(kafka,"\":"); if(iter->templateElement->printFormat==stringFormat) KafkaLog_Putc(kafka,'"'); From de16a9d97017e30c6a92ae99208a88305ed9cdf1 Mon Sep 17 00:00:00 2001 From: eugenio Date: Wed, 17 Jul 2013 12:17:26 +0000 Subject: [PATCH 060/198] changed a snprintf to a strcat in KafkaLog_Write: performance KafkaLog->maxBuf renamed to kafkaLog->bufLen and start_bufLen, more descriptive ones --- src/rbutil/rb_kafka.c | 53 +++++++++++++++++-------------------------- src/rbutil/rb_kafka.h | 7 +++--- 2 files changed, 25 insertions(+), 35 deletions(-) diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index b60d2d8..7c3e7c0 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -99,7 +99,7 @@ static void KafkaLog_Close (rd_kafka_t* handle) *------------------------------------------------------------------- */ KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int maxBuf, const char * topic, const int start_partition, + const char* broker, unsigned int bufLen, const char * topic, const int start_partition, const int end_partition, bool open, const char*filename ) { KafkaLog* this; @@ -107,11 +107,11 @@ KafkaLog* KafkaLog_Init ( this = (KafkaLog*)malloc(sizeof(KafkaLog)); #ifdef HAVE_LIBRDKAFKA if(this){ - this->buf = malloc(sizeof(char)*maxBuf); + this->buf = malloc(sizeof(char)*bufLen); if ( !this->buf) { - FatalError("Unable to allocate a buffer for KafkaLog(%u)!\n", maxBuf); + FatalError("Unable to allocate a buffer for KafkaLog(%u)!\n", bufLen); } }else{ FatalError("Unable to allocate KafkaLog!\n"); @@ -126,7 +126,7 @@ KafkaLog* KafkaLog_Init ( FatalError("alert_json: start_partition > end_partition"); } - this->maxBuf = maxBuf; + this->bufLen = this->start_bufLen = bufLen; #endif this->textLog = NULL; /* Force NULL by now */ KafkaLog_Reset(this); @@ -180,7 +180,8 @@ bool KafkaLog_Flush(KafkaLog* this) free(this->buf); else rd_kafka_produce(this->handler, this->topic, this->actual_partition, RD_KAFKA_OP_F_FREE, this->buf, this->pos); - this->buf = malloc(sizeof(char)*this->maxBuf); + this->buf = SnortAlloc(sizeof(char)*this->start_bufLen); + this->bufLen = this->start_bufLen; #endif if(this->textLog) TextLog_Flush(this->textLog); @@ -215,26 +216,17 @@ bool KafkaLog_Putc (KafkaLog* this, char c) bool KafkaLog_Write (KafkaLog* this, const char* str, int len) { #ifdef HAVE_LIBRDKAFKA - int avail = KafkaLog_Avail(this); - - if ( len >= avail ) + while ( len >= KafkaLog_Avail(this) ) { - KafkaLog_Flush(this); - avail = KafkaLog_Avail(this); - } - len = snprintf(this->buf+this->pos, avail, "%s", str); - - if ( len >= avail ) - { - this->pos = this->maxBuf - 1; - this->buf[this->pos] = '\0'; - return FALSE; - } - else if ( len < 0 ) - { - return FALSE; + this->bufLen*=2; + this->buf = realloc(this->buf,this->bufLen); + if(NULL==this->buf) + return FALSE; } + this->buf[this->pos]='\0'; /* just in case */ + strncat(this->buf+this->pos, str, len); this->pos += len; + assert(this->buf[this->pos] == '\0'); #endif // HAVE_LIBRDKAFKA if(this->textLog) TextLog_Write(this->textLog,str,len); @@ -250,9 +242,6 @@ bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) int avail = KafkaLog_Avail(this); int len; va_list ap; - #ifdef HAVE_LIBRDKAFKA - int currentLenght = this->maxBuf; - #endif va_start(ap, fmt); #ifdef HAVE_LIBRDKAFKA @@ -265,12 +254,12 @@ bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) #ifdef HAVE_LIBRDKAFKA while(len >= avail){ // Send a half json message to Kafka has no sense, so we will try to - // increase the buffer's lenght to allocate the full message. - // TextLog's print will be not changed, just inlined here. - currentLenght*=2; - this->buf = realloc(this->buf,currentLenght); - if(!this->buf) - FatalError("It was not possible to allocate a buffer"); + // increase the buffer's lenght to allocate the full message. + // TextLog's print will be not changed, just inlined here. + this->bufLen*=2; + this->buf = realloc(this->buf,this->bufLen); + if(!this->buf) + FatalError("It was not possible to allocate a buffer"); va_start(ap, fmt); len = vsnprintf(this->buf+this->pos, avail, fmt, ap); va_end(ap); @@ -327,7 +316,7 @@ bool KafkaLog_Quote (KafkaLog* this, const char* qs) } this->buf[pos++] = '"'; - while ( *qs && (this->maxBuf - pos > 2) ) + while ( *qs && (this->bufLen - pos > 2) ) { if ( *qs == '"' || *qs == '\\' ) { diff --git a/src/rbutil/rb_kafka.h b/src/rbutil/rb_kafka.h index 2c83ddc..fab6fd9 100644 --- a/src/rbutil/rb_kafka.h +++ b/src/rbutil/rb_kafka.h @@ -80,7 +80,8 @@ typedef struct _KafkaLog /* buffer attributes: */ unsigned int pos; - unsigned int maxBuf; + unsigned int bufLen; + unsigned int start_bufLen; char * buf; #endif /* TextLog helper. Useful for loggind and just send data to a json file */ @@ -88,7 +89,7 @@ typedef struct _KafkaLog } KafkaLog; KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int maxBuf, const char * topic, const int start_partition, const int end_partition, bool open, const char *filename + const char* broker, unsigned int bufLen, const char * topic, const int start_partition, const int end_partition, bool open, const char *filename ); void KafkaLog_Term (KafkaLog* this); @@ -117,7 +118,7 @@ bool KafkaLog_Flush(KafkaLog*); #ifndef HAVE_LIBRDKAFKA return this->textLog?TextLog_Avail(this->textLog):0; #else - return this->maxBuf - this->pos - 1; + return this->bufLen - this->pos - 1; #endif } From c7477a542972923db526d0dbc37c503d818f7cd8 Mon Sep 17 00:00:00 2001 From: eugenio Date: Wed, 17 Jul 2013 12:28:40 +0000 Subject: [PATCH 061/198] Changed hosts format to [name addr] (See redmine #522 issue) --- src/rbutil/rb_numstrpair_list.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rbutil/rb_numstrpair_list.c b/src/rbutil/rb_numstrpair_list.c index fb5d1e6..1f72143 100644 --- a/src/rbutil/rb_numstrpair_list.c +++ b/src/rbutil/rb_numstrpair_list.c @@ -73,8 +73,8 @@ static Number_str_assoc * FillHostList_Node(char *line_buffer, FILLHOSTSLIST_MOD Number_str_assoc * node = SnortAlloc(sizeof(Number_str_assoc)); if(node){ if((toks = mSplit((char *)line_buffer, " \t", 2, &num_toks, '\\'))){ - node->number_as_str = SnortStrdup(mode==HOSTS?toks[0]:toks[1]); - node->human_readable_str = SnortStrdup(mode==HOSTS?toks[1]:toks[0]); + node->human_readable_str = SnortStrdup(toks[0]); + node->number_as_str = SnortStrdup(toks[1]); switch(mode){ case HOSTS: case NETWORKS: From 529e965e72413c97fe87d979c27cf5b809e564d4 Mon Sep 17 00:00:00 2001 From: eugenio Date: Thu, 25 Jul 2013 11:10:47 +0000 Subject: [PATCH 062/198] Timestamp resolution moved from miliseconds to seconds --- src/output-plugins/spo_alert_json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index bd939ed..8cc5cfc 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -197,7 +197,7 @@ typedef struct _AlertJSONData /* Remember update printElementWithTemplate if some element modified here */ static AlertJSONTemplateElement template[] = { - {TIMESTAMP,"timestamp","event_timestamp",numericFormat,"0"}, + {TIMESTAMP,"timestamp","timestamp",numericFormat,"0"}, {SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat,"0"}, {SENSOR_ID,"sensor_id","sensor_id",numericFormat,"0"}, {SENSOR_NAME,"sensor_name","sensor_name",stringFormat,"-"}, @@ -673,7 +673,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type switch(templateElement->id){ case TIMESTAMP: - KafkaLog_Puts(kafka,itoa10(p->pkth->ts.tv_sec*1000 + p->pkth->ts.tv_usec/1000, buf_uint64, bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(p->pkth->ts.tv_sec, buf_uint64, bufLen_uint64)); break; case SENSOR_ID_SNORT: KafkaLog_Puts(kafka,event?itoa10(ntohl(((Unified2EventCommon *)event)->sensor_id),buf_uint64, bufLen_uint64):templateElement->defaultValue); From 47af71b6e1a3980f92fccbf3120e009aa676800e Mon Sep 17 00:00:00 2001 From: eugenio Date: Tue, 30 Jul 2013 12:45:37 +0000 Subject: [PATCH 063/198] alert-json did not work if --enable-ipv6 was present (Redmine issue 620). Fixed --- src/output-plugins/spo_alert_json.c | 220 ++++++++++++++-------------- src/rbutil/rb_numstrpair_list.c | 41 ------ src/rbutil/rb_numstrpair_list.h | 24 ++- 3 files changed, 136 insertions(+), 149 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 8cc5cfc..7bc6ee6 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -531,45 +531,6 @@ static void AlertJSON(Packet *p, void *event, uint32_t event_type, void *arg) AlertJSONData *data = (AlertJSONData *)arg; RealAlertJSON(p, event, event_type, data); } -/* - * Function: _intoa(unsigned int addr, char* buf, u_short bufLen) - * - * Purpose: A faster replacement for inet_ntoa().Extracted from tcpdump - * - * Arguments: addr => Numeric address. - * buf => Buffer to save string format address. - * bufLen => buf's length. - * - * Returns: Position of buffer where string starts. - */ -char* _intoa(unsigned int addr, char* buf, u_short bufLen) { - char *cp, *retStr; - u_int byte; - int n; - - cp = &buf[bufLen]; - *--cp = '\0'; - - n = 4; - do { - byte = addr & 0xff; - *--cp = byte % 10 + '0'; - byte /= 10; - if (byte > 0) { - *--cp = byte % 10 + '0'; - byte /= 10; - if (byte > 0) - *--cp = byte + '0'; - } - *--cp = '.'; - addr >>= 8; - } while (--n > 0); - - /* Convert the string to lowercase */ - retStr = (char*)(cp+1); - - return(retStr); -} /* * Function: C++ version 0.4 char* style "itoa", Written by Lukás Chmela. (Modified) @@ -631,14 +592,15 @@ static inline void printHWaddr(KafkaLog *kafka,const uint8_t *addr,char * buf,co static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement){ SigNode *sn; char tcpFlags[9]; - char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"]; + /*char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"];*/ + char buf[sizeof "0000:0000:0000:0000:0000:0000:0000:0000"]; const size_t bufLen = sizeof buf; - char * buf_uint64 = buf; - const size_t bufLen_uint64 = bufLen; - /* sizeof "18446744073709551616" = 2^64 < sizeof buf. So it's enough with buf.*/ KafkaLog * kafka = jsonData->kafka; - uint32_t ipv4 = 0; - const int initial_buffer_pos = kafka->pos; + sfip_t ip; + const int initial_buffer_pos = KafkaLog_Tell(jsonData->kafka); +#ifdef HAVE_GEOIP + geoipv6_t ipv6; +#endif /* Avoid repeated code */ if(IPH_IS_VALID(p)){ @@ -652,7 +614,14 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case SRC_COUNTRY: case SRC_COUNTRY_CODE: #endif - ipv4 = ntohl(GET_SRC_ADDR(p).s_addr); +#ifdef SUP_IP6 + sfip_set_ip(&ip,GET_SRC_ADDR(p)); +#else + { + int ipv4 = ntohl(GET_SRC_ADDR(p).s_addr); + sfip_set_raw(&ip,&ipv4,AF_INET); + } +#endif break; case DST_TEMPLATE_ID: @@ -664,40 +633,62 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case DST_COUNTRY: case DST_COUNTRY_CODE: #endif - ipv4 = ntohl(GET_DST_ADDR(p).s_addr); +#ifdef SUP_IP6 + sfip_set_ip(&ip,GET_DST_ADDR(p)); +#else + { + int ipv4 = ntohl(GET_DST_ADDR(p).s_addr); + sfip_set_raw(&ip,&ipv4,AF_INET); + } +#endif break; default: break; }; + +#ifdef HAVE_GEOIP + if(ip.family == AF_INET6){ + switch(templateElement->id){ + case SRC_COUNTRY: + case SRC_COUNTRY_CODE: + case DST_COUNTRY: + case DST_COUNTRY_CODE: + memcpy(ipv6.s6_addr, ip.ip8, sizeof(ipv6.s6_addr)); + break; + default: + break; + }; + } +#endif } switch(templateElement->id){ case TIMESTAMP: - KafkaLog_Puts(kafka,itoa10(p->pkth->ts.tv_sec, buf_uint64, bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(p->pkth->ts.tv_sec, buf, bufLen)); break; case SENSOR_ID_SNORT: - KafkaLog_Puts(kafka,event?itoa10(ntohl(((Unified2EventCommon *)event)->sensor_id),buf_uint64, bufLen_uint64):templateElement->defaultValue); + KafkaLog_Puts(kafka,event?itoa10(ntohl(((Unified2EventCommon *)event)->sensor_id),buf, bufLen):templateElement->defaultValue); break; case SENSOR_ID: - KafkaLog_Puts(kafka,itoa10(jsonData->sensor_id,buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(jsonData->sensor_id,buf,bufLen)); break; case SENSOR_NAME: KafkaLog_Puts(kafka,jsonData->sensor_name); break; case SIG_GENERATOR: if(event != NULL) - KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->generator_id),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->generator_id),buf,bufLen)); break; case SIG_ID: if(event != NULL) - KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->signature_id),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->signature_id),buf,bufLen)); break; case SIG_REV: if(event != NULL) - KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->signature_revision),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->signature_revision),buf,bufLen)); break; case PRIORITY: - KafkaLog_Puts(kafka,event? itoa10(ntohl(((Unified2EventCommon *)event)->priority_id),buf_uint64,bufLen_uint64): templateElement->defaultValue); + KafkaLog_Puts(kafka,event? itoa10(ntohl(((Unified2EventCommon *)event)->priority_id),buf,bufLen): templateElement->defaultValue); break; case CLASSIFICATION: if(event != NULL) @@ -728,7 +719,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type uint16_t i; if(p && p->dsize>0){ for(i=0;idsize;++i) - KafkaLog_Puts(kafka, itoa16(p->data[i],buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa16(p->data[i],buf,bufLen)); }else{ KafkaLog_Puts(kafka, templateElement->defaultValue); } @@ -737,7 +728,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case PROTO: if(IPH_IS_VALID(p)){ - Number_str_assoc * service_name_asoc = SearchNumberStr(GET_IPH_PROTO(p),jsonData->protocols,PROTOCOLS); + Number_str_assoc * service_name_asoc = SearchNumberStr(GET_IPH_PROTO(p),jsonData->protocols); if(service_name_asoc){ KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); break; @@ -745,85 +736,85 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type } /* don't break! */ case PROTO_ID: - KafkaLog_Puts(kafka,itoa10(IPH_IS_VALID(p)?GET_IPH_PROTO(p):0,buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(IPH_IS_VALID(p)?GET_IPH_PROTO(p):0,buf,bufLen)); break; case ETHSRC: if(p->eh) - printHWaddr(kafka, p->eh->ether_src, buf_uint64,bufLen_uint64); + printHWaddr(kafka, p->eh->ether_src, buf,bufLen); break; case ETHDST: if(p->eh) - printHWaddr(kafka,p->eh->ether_dst,buf_uint64,bufLen_uint64); + printHWaddr(kafka,p->eh->ether_dst,buf,bufLen); break; case ARP_HW_SADDR: if(p->ah) - printHWaddr(kafka,p->ah->arp_sha,buf_uint64,bufLen_uint64); + printHWaddr(kafka,p->ah->arp_sha,buf,bufLen); break; case ARP_HW_SPROT: if(p->ah) { KafkaLog_Puts(kafka, "0x"); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[0],buf_uint64,bufLen_uint64)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[1],buf_uint64,bufLen_uint64)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[2],buf_uint64,bufLen_uint64)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[3],buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[0],buf,bufLen)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[1],buf,bufLen)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[2],buf,bufLen)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[3],buf,bufLen)); } break; case ARP_HW_TADDR: if(p->ah) - printHWaddr(kafka,p->ah->arp_tha,buf_uint64,bufLen_uint64); + printHWaddr(kafka,p->ah->arp_tha,buf,bufLen); break; case ARP_HW_TPROT: if(p->ah) { KafkaLog_Puts(kafka, "0x"); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[0],buf_uint64,bufLen_uint64)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[1],buf_uint64,bufLen_uint64)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[2],buf_uint64,bufLen_uint64)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[3],buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[0],buf,bufLen)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[1],buf,bufLen)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[2],buf,bufLen)); + KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[3],buf,bufLen)); } break; case ETHTYPE: if(p->eh) { - KafkaLog_Puts(kafka, itoa10(ntohs(p->eh->ether_type),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa10(ntohs(p->eh->ether_type),buf,bufLen)); } break; case UDPLENGTH: if(p->udph){ - KafkaLog_Puts(kafka, itoa10(ntohs(p->udph->uh_len),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa10(ntohs(p->udph->uh_len),buf,bufLen)); } break; case ETHLENGTH: if(p->eh){ - KafkaLog_Puts(kafka, itoa10(p->pkth->len,buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa10(p->pkth->len,buf,bufLen)); } break; case VLAN_PRIORITY: if(p->vh) - KafkaLog_Puts(kafka,itoa10(VTH_PRIORITY(p->vh),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(VTH_PRIORITY(p->vh),buf,bufLen)); break; case VLAN_DROP: if(p->vh) - KafkaLog_Puts(kafka,itoa10(VTH_CFI(p->vh),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(VTH_CFI(p->vh),buf,bufLen)); break; case VLAN: if(p->vh) - KafkaLog_Puts(kafka,itoa10(VTH_VLAN(p->vh),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(VTH_VLAN(p->vh),buf,bufLen)); break; case VLAN_NAME: if(p->vh){ - Number_str_assoc * service_name_asoc = SearchNumberStr(VTH_VLAN(p->vh),jsonData->vlans,VLANS); + Number_str_assoc * service_name_asoc = SearchNumberStr(VTH_VLAN(p->vh),jsonData->vlans); if(service_name_asoc) KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); else - KafkaLog_Puts(kafka,itoa10(VTH_VLAN(p->vh),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(VTH_VLAN(p->vh),buf,bufLen)); } break; @@ -837,11 +828,11 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case IPPROTO_TCP: { const uint16_t port = templateElement->id==SRCPORT_NAME? p->sp:p->dp; - Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services,SERVICES); + Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services); if(service_name_asoc) KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); else /* Log port number */ - KafkaLog_Puts(kafka,itoa10(templateElement->id==SRCPORT_NAME? p->sp:p->dp,buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(templateElement->id==SRCPORT_NAME? p->sp:p->dp,buf,bufLen)); } break; }; @@ -854,7 +845,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type { case IPPROTO_UDP: case IPPROTO_TCP: - KafkaLog_Puts(kafka,itoa10(templateElement->id==SRCPORT? p->sp:p->dp,buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(templateElement->id==SRCPORT? p->sp:p->dp,buf,bufLen)); break; default: /* Always log something */ KafkaLog_Puts(kafka,templateElement->defaultValue); @@ -866,36 +857,39 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; case SRC_TEMPLATE_ID: - KafkaLog_Puts(kafka,itoa10(ipv4,buf_uint64,bufLen_uint64)); - break; case DST_TEMPLATE_ID: - KafkaLog_Puts(kafka,itoa10(ipv4,buf_uint64,bufLen_uint64)); + /*if(sfip_family(&ip)==AF_INET){ // buggy sfip_family macro...*/ + if(ip.family==AF_INET) + { + KafkaLog_Puts(kafka,itoa10(*ip.ip32, buf,bufLen)); + } + /* doesn't make very sense print so large number. If you want, make me know. */ break; case SRC_STR: case DST_STR: { - KafkaLog_Puts(kafka,_intoa(ipv4, buf, bufLen)); + KafkaLog_Puts(kafka,sfip_to_str(&ip)); } break; case SRC_NAME: case DST_NAME: { - Number_str_assoc * ip_str_node = SearchNumberStr(ipv4,jsonData->hosts,HOSTS); - const char * ip_name = ip_str_node ? ip_str_node->human_readable_str : _intoa(ipv4, buf, bufLen); + Number_str_assoc * ip_str_node = SearchIpStr(ip,jsonData->hosts,HOSTS); + const char * ip_name = ip_str_node ? ip_str_node->human_readable_str : sfip_to_str(&ip); KafkaLog_Puts(kafka,ip_name); } break; case SRC_NET: case DST_NET: { - Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); + Number_str_assoc * ip_net = SearchIpStr(ip,jsonData->nets,NETWORKS); KafkaLog_Puts(kafka,ip_net?ip_net->number_as_str:templateElement->defaultValue); } break; case SRC_NET_NAME: case DST_NET_NAME: { - Number_str_assoc * ip_net = SearchNumberStr(ipv4,jsonData->nets,NETWORKS); + Number_str_assoc * ip_net = SearchIpStr(ip,jsonData->nets,NETWORKS); KafkaLog_Puts(kafka,ip_net?ip_net->human_readable_str:templateElement->defaultValue); } break; @@ -904,30 +898,38 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case SRC_COUNTRY: case DST_COUNTRY: if(jsonData->gi){ - const char * country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ipv4); + const char * country_name = NULL; + if(ip.family == AF_INET) + country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ip.ip32[0]); + else + country_name = GeoIP_country_name_by_ipnum_v6(jsonData->gi,ipv6); KafkaLog_Puts(kafka,country_name?country_name:templateElement->defaultValue); } break; case SRC_COUNTRY_CODE: case DST_COUNTRY_CODE: if(jsonData->gi){ - const char * country_code =GeoIP_country_code_by_ipnum(jsonData->gi,ipv4); - KafkaLog_Puts(kafka,country_code?country_code:templateElement->defaultValue); + const char * country_name = NULL; + if(ip.family == AF_INET) + country_name = GeoIP_country_code_by_ipnum(jsonData->gi,ip.ip32[0]); + else + country_name = GeoIP_country_code_by_ipnum_v6(jsonData->gi,ipv6); + KafkaLog_Puts(kafka,country_name?country_name:templateElement->defaultValue); } break; #endif /* HAVE_GEOIP */ case ICMPTYPE: if(p->icmph) - KafkaLog_Puts(kafka, itoa10(p->icmph->type,buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa10(p->icmph->type,buf,bufLen)); break; case ICMPCODE: if(p->icmph) - KafkaLog_Puts(kafka, itoa10(p->icmph->code,buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa10(p->icmph->code,buf,bufLen)); break; case ICMPID: if(p->icmph) - KafkaLog_Puts(kafka, itoa10(ntohs(p->icmph->s_icmp_id),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa10(ntohs(p->icmph->s_icmp_id),buf,bufLen)); break; case ICMPSEQ: if(p->icmph){ @@ -935,54 +937,54 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type PrintJSONFieldName(kafka,JSON_ICMPSEQ_NAME); KafkaLog_Print(kafka, "%d",ntohs(p->icmph->s_icmp_seq)); */ - KafkaLog_Puts(kafka,itoa10(ntohs(p->icmph->s_icmp_seq),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(ntohs(p->icmph->s_icmp_seq),buf,bufLen)); } break; case TTL: if(IPH_IS_VALID(p)) - KafkaLog_Puts(kafka,itoa10(GET_IPH_TTL(p),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(GET_IPH_TTL(p),buf,bufLen)); break; case TOS: if(IPH_IS_VALID(p)) - KafkaLog_Puts(kafka,itoa10(GET_IPH_TOS(p),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(GET_IPH_TOS(p),buf,bufLen)); break; case ID: if(IPH_IS_VALID(p)) - KafkaLog_Puts(kafka,itoa10(IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p)),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p)),buf,bufLen)); break; case IPLEN: if(IPH_IS_VALID(p)) - KafkaLog_Puts(kafka,itoa10(GET_IPH_LEN(p) << 2,buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa10(GET_IPH_LEN(p) << 2,buf,bufLen)); break; case DGMLEN: if(IPH_IS_VALID(p)){ // XXX might cause a bug when IPv6 is printed? - KafkaLog_Puts(kafka, itoa10(ntohs(GET_IPH_LEN(p)),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa10(ntohs(GET_IPH_LEN(p)),buf,bufLen)); } break; case TCPSEQ: if(p->tcph){ // KafkaLog_Print(kafka, "lX%0x",(u_long) ntohl(p->tcph->th_ack)); // hex format - KafkaLog_Puts(kafka,itoa16(ntohl(p->tcph->th_seq),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa16(ntohl(p->tcph->th_seq),buf,bufLen)); } break; case TCPACK: if(p->tcph){ // KafkaLog_Print(kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); - KafkaLog_Puts(kafka,itoa16(ntohl(p->tcph->th_ack),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa16(ntohl(p->tcph->th_ack),buf,bufLen)); } break; case TCPLEN: if(p->tcph){ - KafkaLog_Puts(kafka, itoa10(TCP_OFFSET(p->tcph) << 2,buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka, itoa10(TCP_OFFSET(p->tcph) << 2,buf,bufLen)); } break; case TCPWINDOW: if(p->tcph){ //KafkaLog_Print(kafka, "0x%X",ntohs(p->tcph->th_win)); // hex format - KafkaLog_Puts(kafka,itoa16(ntohs(p->tcph->th_win),buf_uint64,bufLen_uint64)); + KafkaLog_Puts(kafka,itoa16(ntohs(p->tcph->th_win),buf,bufLen)); } break; case TCPFLAGS: @@ -998,7 +1000,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; }; - return kafka->pos-initial_buffer_pos; /* if we have write something */ + return KafkaLog_Tell(kafka)-initial_buffer_pos; /* if we have write something */ } /* @@ -1025,7 +1027,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging JSON Alert data\n");); KafkaLog_Putc(kafka,'{'); for(iter=jsonData->outputTemplate;iter;iter=iter->next){ - const int initial_pos = kafka->pos; + const int initial_pos = KafkaLog_Tell(kafka); if(iter!=jsonData->outputTemplate) KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); @@ -1039,8 +1041,12 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO if(iter->templateElement->printFormat==stringFormat) KafkaLog_Putc(kafka,'"'); - if(0==writed) + if(0==writed){ + #ifdef HAVE_LIBRDKAFKA kafka->pos = initial_pos; // Revert the insertion of empty element */ + #endif + kafka->textLog->pos = initial_pos; + } } KafkaLog_Putc(kafka,'}'); diff --git a/src/rbutil/rb_numstrpair_list.c b/src/rbutil/rb_numstrpair_list.c index 1f72143..8cc084f 100644 --- a/src/rbutil/rb_numstrpair_list.c +++ b/src/rbutil/rb_numstrpair_list.c @@ -137,45 +137,4 @@ void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOS } fclose(file); -} - -/* - * Function SearchNumberStr - * - * Purpose: Find a number in the list and return the associated node. - * - * Arguments: number => number to search - * list => list to search in - * mode => See FILLHOSTSLIST_MODE - */ -Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *iplist,FILLHOSTSLIST_MODE mode){ - Number_str_assoc * node=NULL; - - switch (mode){ - case HOSTS: - case NETWORKS: - { - sfip_t ip_to_cmp; - const SFIP_RET ret = sfip_set_raw(&ip_to_cmp, &number, AF_INET); - if(ret!=SFIP_SUCCESS) - FatalError("alert_json: Cannot create sfip to compare in line %lu",__LINE__); - - for(node = (Number_str_assoc *)iplist;node;node=node->next){ - if(mode==HOSTS && sfip_equals(ip_to_cmp,node->number.ip)) - break; - else if(mode==NETWORKS && sfip_fast_cont4(&node->number.ip,&ip_to_cmp)) - break; - } - } - break; - case SERVICES: - case PROTOCOLS: - case VLANS: - for(node=(Number_str_assoc *)iplist;node;node=node->next){ - if(node->number.service /* same as .protocol or .vlan*/ == number) - break; - } - break; - }; - return node; } \ No newline at end of file diff --git a/src/rbutil/rb_numstrpair_list.h b/src/rbutil/rb_numstrpair_list.h index 3a2129c..e01a203 100644 --- a/src/rbutil/rb_numstrpair_list.h +++ b/src/rbutil/rb_numstrpair_list.h @@ -29,6 +29,8 @@ * save hostname -> hostip or service_name->service_number pairs. */ +#include "debug.h" +#include "fatal.h" #include "sf_ip.h" typedef struct _Number_str_assoc{ @@ -43,4 +45,24 @@ typedef enum{HOSTS,NETWORKS,SERVICES,PROTOCOLS,VLANS} FILLHOSTSLIST_MODE; void freeNumberStrAssocList(Number_str_assoc * nstrList); void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOSTSLIST_MODE mode); -Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *iplist,FILLHOSTSLIST_MODE mode); \ No newline at end of file + +static inline Number_str_assoc * SearchIpStr(sfip_t ip ,const Number_str_assoc *iplist,FILLHOSTSLIST_MODE mode){ + if(mode!=HOSTS && mode!=NETWORKS) FatalError("Oops. Wrong use.\n"); + Number_str_assoc * node; + for(node = (Number_str_assoc *)iplist;node;node=node->next) + { + if(mode==HOSTS ? sfip_equals(ip,node->number.ip) : sfip_fast_cont4(&node->number.ip,&ip)) + break; + } + return node; +} + +static inline Number_str_assoc * SearchNumberStr(uint32_t number,const Number_str_assoc *list){ + Number_str_assoc * node; + for(node=(Number_str_assoc *)list;node;node=node->next) + { + if(node->number.service /* same as .protocol or .vlan*/ == number) + break; + } + return node; +} \ No newline at end of file From b346855f1829934ddc352abed683a66c80edc6e8 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Wed, 31 Jul 2013 19:47:45 +0000 Subject: [PATCH 064/198] Changed configure.in so it can import rdkafka from any location. Now you can specify kafka location using --with-kafka-* params configure params. --- configure.in | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/configure.in b/configure.in index ad15235..fd79195 100644 --- a/configure.in +++ b/configure.in @@ -146,30 +146,44 @@ else AC_MSG_RESULT(no) fi -AC_MSG_CHECKING(for rdkafka libraries) +AC_ARG_WITH(rdkafka_includes, + [ --with-rdkafka-includes=DIR rdkafka include directory], + [with_rdkafka_includes="$withval"],[with_rdkafka_includes="no"]) + +AC_ARG_WITH(rdkafka_libraries, + [ --with-rdkfaka-libraries=DIR rdkafka library directory], + [with_rdkafka_libraries="$withval"],[with_rdkafka_libraries="no"]) + +if test "x$with_rdkafka_includes" != "x"; then + CFLAGS="${CFLAGS} -I${with_rdkafka_includes}" +fi + +if test "x$with_rdkafka_libraries" != "xno"; then + LDFLAGS="${LDFLAGS} -L${with_rdkafka_libraries}" +fi + AC_ARG_ENABLE(kafka, [ --enable-kafka Enable kafka messagin.], enable_kafka="$enableval", enable_kafka="no") -if test "x$enable_kafka" = "xyes"; then - AC_CHECK_HEADERS([librdkafka/rdkafka.h],[], + +if test "x$enable_kafka" = "x$enableval"; then + AC_CHECK_HEADERS([librdkafka/rdkafka.h],[], [ echo "Error: Librdkafka headers not found." echo "You can download and install it from https://github.com/edenhill/librdkafka" echo "Remember you have to use 0.7 branch" exit 1 ]) - AC_CHECK_LIB(rdkafka,rd_kafka_new,[], - [ - echo "Error: Librdkafka library not found." - echo "You can download and install it from https://github.com/edenhill/librdkafka" - echo "Remember you have to use 0.7 branch" - exit 1 - ]) - AC_DEFINE([HAVE_RDKAFKA],[],[Have Apache Kafka library]) - LDFLAGS="$LDFLAGS -lrdkafka" - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) + + AC_CHECK_LIB(rdkafka,rd_kafka_new,[], + [ + echo "Error: Librdkafka library not found." + echo "You can download and install it from https://github.com/edenhill/librdkafka" + echo "Remember you have to use 0.7 branch" + exit 1 + ]) + + AC_DEFINE([HAVE_RDKAFKA],[],[Have Apache Kafka library]) fi From 197166953751474c316601adbb67b41cf441f1d5 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Thu, 1 Aug 2013 13:23:36 +0000 Subject: [PATCH 065/198] Added rb_pointers.h header to have specific commands to check pointers. Added type,domain,domain_id template parameters too. --- src/output-plugins/spo_alert_json.c | 127 ++++++++++++++++++++-------- src/rbutil/rb_pointers.h | 18 ++++ 2 files changed, 111 insertions(+), 34 deletions(-) create mode 100644 src/rbutil/rb_pointers.h diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 7bc6ee6..e4d1a04 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -68,6 +68,7 @@ #include "sfutil/sf_textlog.h" #include "rbutil/rb_kafka.h" #include "rbutil/rb_numstrpair_list.h" +#include "rbutil/rb_pointers.h" #include "errno.h" #include "signal.h" #include "log_text.h" @@ -77,7 +78,7 @@ #endif // HAVE_GEOIP -#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,sensor_name,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,type,sensor_name,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" @@ -99,6 +100,9 @@ typedef enum{ SENSOR_ID_SNORT, SENSOR_ID, SENSOR_NAME, + DOMAIN, + DOMAIN_ID, + TYPE, SIG_GENERATOR, SIG_ID, SIG_REV, @@ -188,8 +192,8 @@ typedef struct _AlertJSONData TemplateElementsList * outputTemplate; AlertJSONConfig *config; Number_str_assoc * hosts, *nets, *services, *protocols, *vlans; - uint64_t sensor_id; - char * sensor_name; + uint32_t sensor_id,domain_id; + char * sensor_name, *sensor_type,*domain; #ifdef HAVE_GEOIP GeoIP *gi; #endif @@ -201,6 +205,9 @@ static AlertJSONTemplateElement template[] = { {SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat,"0"}, {SENSOR_ID,"sensor_id","sensor_id",numericFormat,"0"}, {SENSOR_NAME,"sensor_name","sensor_name",stringFormat,"-"}, + {DOMAIN,"domain","domain",stringFormat,"-"}, + {DOMAIN_ID,"domain_id","domain_id",numericFormat,"-"}, + {TYPE,"type","type",stringFormat,"-"}, {SIG_GENERATOR,"sig_generator","sig_generator",numericFormat,"0"}, {SIG_ID,"sig_id","sig_id",numericFormat,"0"}, {SIG_REV,"sig_rev","rev",numericFormat,"0"}, @@ -332,7 +339,7 @@ static void AlertJSONInit(char *args) * id ::= number * Arguments: args => argument list * - * Returns: void function + * Returns: New filled AlertJSONData struct. */ static AlertJSONData *AlertJSONParseArgs(char *args) { @@ -361,38 +368,78 @@ static AlertJSONData *AlertJSONParseArgs(char *args) for (i = 0; i < num_toks; i++) { const char* tok = toks[i]; - - if ( !strncasecmp(tok, "filename=",strlen("filename=")) && !filename){ - filename = SnortStrdup(tok+strlen("filename=")); - }else if(!strncasecmp(tok,"params=",strlen("params=")) && !data->jsonargs){ - data->jsonargs = SnortStrdup(tok+strlen("params=")); - }else if(!strncasecmp(tok, KAFKA_PROT,strlen(KAFKA_PROT)) && !kafka_str){ - kafka_str = SnortStrdup(tok); - }else if ( !strncasecmp("default", tok,strlen("default")) && !data->jsonargs){ - data->jsonargs = SnortStrdup(DEFAULT_JSON); - }else if(!strncasecmp(tok,"sensor_name=",strlen("sensor_name=")) && !data->sensor_name){ - data->sensor_name = SnortStrdup(tok+strlen("sensor_name=")); - }else if(!strncasecmp(tok,"sensor_id=",strlen("sensor_id="))){ + if ( !strncasecmp(tok, "filename=",strlen("filename=")) && !filename) + { + RB_IF_CLEAN(filename,filename = SnortStrdup(tok+strlen("filename=")),"%s(%i) param setted twice\n",tok,i); + } + else if(!strncasecmp(tok,"params=",strlen("params=")) && !data->jsonargs) + { + RB_IF_CLEAN(data->jsonargs,data->jsonargs = SnortStrdup(tok+strlen("params=")),"%s(%i) param setted twice\n",tok,i); + } + else if(!strncasecmp(tok, KAFKA_PROT,strlen(KAFKA_PROT)) && !kafka_str) + { + RB_IF_CLEAN(kafka_str,kafka_str = SnortStrdup(tok),"%s(%i) param setted twice\n",tok,i); + } + else if ( !strncasecmp(tok, "default", strlen("default")) && !data->jsonargs) + { + RB_IF_CLEAN(data->jsonargs,data->jsonargs = SnortStrdup(DEFAULT_JSON),"%s(%i) param setted twice\n",tok,i); + } + else if(!strncasecmp(tok,"sensor_name=",strlen("sensor_name=")) && !data->sensor_name) + { + RB_IF_CLEAN(data->sensor_name,data->sensor_name = SnortStrdup(tok+strlen("sensor_name=")),"%s(%i) param setted twice\n",tok,i); + } + else if(!strncasecmp(tok,"sensor_id=",strlen("sensor_id="))) + { data->sensor_id = atol(tok + strlen("sensor_id=")); - }else if(!strncasecmp(tok,"hosts=",strlen("hosts="))){ - hostsListPath = SnortStrdup(tok+strlen("hosts=")); - }else if(!strncasecmp(tok,"networks=",strlen("networks="))){ - networksPath = SnortStrdup(tok+strlen("networks=")); - }else if(!strncasecmp(tok,"services=",strlen("services="))){ - servicesPath = SnortStrdup(tok+strlen("services=")); - }else if(!strncasecmp(tok,"protocols=",strlen("protocols="))){ - protocolsPath = SnortStrdup(tok+strlen("protocols=")); - }else if(!strncasecmp(tok,"vlans=",strlen("vlans"))){ - vlansPath = SnortStrdup(tok+strlen("vlans=")); - }else if(!strncasecmp(tok,"start_partition=",strlen("start_partition="))){ + } + else if(!strncasecmp(tok,"sensor_type=",strlen("sensor_type="))) + { + RB_IF_CLEAN(data->sensor_type,data->sensor_type = SnortStrdup(tok + strlen("sensor_type=")),"%s(%i) param setted twice.\n",tok,i); + } + else if(!strncasecmp(tok,"hosts=",strlen("hosts="))) + { + RB_IF_CLEAN(hostsListPath, hostsListPath = SnortStrdup(tok+strlen("hosts=")),"%s(%i) param setted twice.\n",tok,i); + } + else if(!strncasecmp(tok,"networks=",strlen("networks="))) + { + RB_IF_CLEAN(networksPath,networksPath = SnortStrdup(tok+strlen("networks=")),"%s(%i) param setted twice.\n",tok,i); + } + else if(!strncasecmp(tok,"services=",strlen("services="))) + { + RB_IF_CLEAN(servicesPath, servicesPath = SnortStrdup(tok+strlen("services=")),"%s(%i) param setted twice.\n",tok,i); + } + else if(!strncasecmp(tok,"protocols=",strlen("protocols="))) + { + RB_IF_CLEAN(protocolsPath, protocolsPath = SnortStrdup(tok+strlen("protocols=")),"%s(%i) param setted twice.\n",tok,i); + } + else if(!strncasecmp(tok,"vlans=",strlen("vlans"))) + { + RB_IF_CLEAN(vlansPath, vlansPath = SnortStrdup(tok+strlen("vlans=")),"%s(%i) param setted twice.\n",tok,i); + } + else if(!strncasecmp(tok,"start_partition=",strlen("start_partition="))) + { start_partition = end_partition = atol(tok+strlen("start_partition=")); - }else if(!strncasecmp(tok,"end_partition=",strlen("end_partition="))){ + } + else if(!strncasecmp(tok,"end_partition=",strlen("end_partition="))) + { end_partition = atol(tok+strlen("end_partition=")); + } + else if(!strncasecmp(tok,"domain=",strlen("domain="))) + { + RB_IF_CLEAN(data->domain, data->domain = SnortStrdup(tok+strlen("domain=")),"%s(%i) param setted twice.\n",tok,i); + } + else if(!strncasecmp(tok,"domain_id=",strlen("domain_id="))) + { + data->domain_id = atol(tok+strlen("domain_id=")); + } #ifdef HAVE_GEOIP - }else if(!strncasecmp(tok,"geoip=",strlen("geoip="))){ - geoIP_path = SnortStrdup(tok+strlen("geoip=")); + else if(!strncasecmp(tok,"geoip=",strlen("geoip="))) + { + RB_IF_CLEAN(geoIP_path,geoIP_path = SnortStrdup(tok+strlen("geoip=")),"%s(%i) param setted twice.\n",tok,i); + } #endif // HAVE_GEOIP - }else{ + else + { FatalError("alert_json: Cannot parse %s(%i): %s\n", file_name, file_line, tok); } @@ -647,7 +694,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type }; #ifdef HAVE_GEOIP - if(ip.family == AF_INET6){ + if(IPH_IS_VALID(p) && ip.family == AF_INET6){ switch(templateElement->id){ case SRC_COUNTRY: case SRC_COUNTRY_CODE: @@ -662,6 +709,9 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type #endif } + #ifdef DEBUG + if(NULL==templateElement) FatalError("TemplateElement was not setted (File %s line %d)\n.",__FILE__,__LINE__); + #endif switch(templateElement->id){ case TIMESTAMP: KafkaLog_Puts(kafka,itoa10(p->pkth->ts.tv_sec, buf, bufLen)); @@ -675,6 +725,15 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case SENSOR_NAME: KafkaLog_Puts(kafka,jsonData->sensor_name); break; + case DOMAIN: + if(jsonData->domain) KafkaLog_Puts(kafka,jsonData->domain); + break; + case DOMAIN_ID: + KafkaLog_Puts(kafka,itoa10(jsonData->domain_id,buf,bufLen)); + break; + case TYPE: + if(jsonData->sensor_type) KafkaLog_Puts(kafka,jsonData->sensor_type); + break; case SIG_GENERATOR: if(event != NULL) KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->generator_id),buf,bufLen)); @@ -996,7 +1055,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; default: - FatalError("Template id %d not found (line %d)\n",templateElement->id,__LINE__); + FatalError("Template %s(%d) not found\n",templateElement->templateName,templateElement->id); break; }; @@ -1045,7 +1104,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO #ifdef HAVE_LIBRDKAFKA kafka->pos = initial_pos; // Revert the insertion of empty element */ #endif - kafka->textLog->pos = initial_pos; + if(kafka->textLog) kafka->textLog->pos = initial_pos; } } diff --git a/src/rbutil/rb_pointers.h b/src/rbutil/rb_pointers.h new file mode 100644 index 0000000..154d4df --- /dev/null +++ b/src/rbutil/rb_pointers.h @@ -0,0 +1,18 @@ + +#ifndef RB_POINTERS +#define RB_POINTERS + +#include "fatal.h" + +/* + * Macro: Perform an action only if the pointer is NULL. + * + * Purpose: Check if a ponter is clean. If not, it raise a fatal error. + * Arguments: P => Pointer to ckeck. + * CODE => Code is pointer was not NULL. + * VA => Message to raise. + * + */ +#define RB_IF_CLEAN(P,CODE,...) do{if(P) FatalError(__VA_ARGS__); CODE;}while(0) + +#endif // RB_POINTERS From f7eff4796dc8456dc3f45284dbab90c3bf267f6f Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Thu, 1 Aug 2013 13:50:41 +0000 Subject: [PATCH 066/198] Geoip libraries can now be specified in configure (--with...) --- configure.in | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index fd79195..20ea313 100644 --- a/configure.in +++ b/configure.in @@ -124,7 +124,22 @@ if test "x$enable_64bit_gcc" = "xyes"; then CFLAGS="$CFLAGS -m64" fi -AC_MSG_CHECKING(for Maxmind GeiIP libraries) +AC_ARG_WITH(geo_ip_includes, + [ --with-geo-ip-includes=DIR Maxmind geoip include directory], + [with_geoip_includes="$withval"],[with_geoip_includes="no"]) + +AC_ARG_WITH(geo_ip_libraries, + [ --with-geo-ip-libraries=DIR Maxmind geoip library directory], + [with_geoip_libraries="$withval"],[with_geoip_libraries="no"]) + +if test "x$with_geoip_includes" != "xno"; then + CFLAGS="${CFLAGS} -I${with_geoip_includes}" +fi + +if test "x$with_geoip_libraries" != "xno"; then + LDFLAGS="${LDFLAGS} -L${with_geoip_libraries}" +fi + AC_ARG_ENABLE(geo-ip, [ --enable-geo-ip Enable geo-ip localization.], enable_geo_ip="$enableval", enable_geop_ip="no") @@ -154,7 +169,7 @@ AC_ARG_WITH(rdkafka_libraries, [ --with-rdkfaka-libraries=DIR rdkafka library directory], [with_rdkafka_libraries="$withval"],[with_rdkafka_libraries="no"]) -if test "x$with_rdkafka_includes" != "x"; then +if test "x$with_rdkafka_includes" != "xno"; then CFLAGS="${CFLAGS} -I${with_rdkafka_includes}" fi @@ -182,7 +197,8 @@ if test "x$enable_kafka" = "x$enableval"; then echo "Remember you have to use 0.7 branch" exit 1 ]) - + + LDFLAGS="${LDFLAGS} -lrdkafka" AC_DEFINE([HAVE_RDKAFKA],[],[Have Apache Kafka library]) fi From 70ae7b8ee0ee4983d6a5fa04d3b6b105c84215b0 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Fri, 2 Aug 2013 10:48:51 +0000 Subject: [PATCH 067/198] Sending action of message (not fully supported). Some numbers sended in hex format => json not supported. --- src/output-plugins/spo_alert_json.c | 40 +++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index e4d1a04..3cf902b 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,8 +77,7 @@ #include "GeoIP.h" #endif // HAVE_GEOIP - -#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,type,sensor_name,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,type,sensor_name,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" @@ -107,6 +106,7 @@ typedef enum{ SIG_ID, SIG_REV, PRIORITY, + ACTION, CLASSIFICATION, MSG, PAYLOAD, @@ -208,6 +208,7 @@ static AlertJSONTemplateElement template[] = { {DOMAIN,"domain","domain",stringFormat,"-"}, {DOMAIN_ID,"domain_id","domain_id",numericFormat,"-"}, {TYPE,"type","type",stringFormat,"-"}, + {ACTION,"action","action",stringFormat,"-"}, {SIG_GENERATOR,"sig_generator","sig_generator",numericFormat,"0"}, {SIG_ID,"sig_id","sig_id",numericFormat,"0"}, {SIG_REV,"sig_rev","rev",numericFormat,"0"}, @@ -623,6 +624,30 @@ static inline void printHWaddr(KafkaLog *kafka,const uint8_t *addr,char * buf,co } } +static const char * actionOfEvent(void * voidevent,uint32_t event_type){ + #define EVENT_IMPACT_FLAG(e) e->impact_flag + #define EVENT_BLOCKED(e) e->blocked + #define ACTION_OF_EVENT(e) \ + if(EVENT_IMPACT_FLAG(event)==0 && EVENT_BLOCKED(event)==0) return "alert";\ + if(EVENT_IMPACT_FLAG(event)==32 && EVENT_BLOCKED(event)==1) return "drop";\ + if(event==NULL && event_type ==0) return "log" + + switch(event_type){ + case 7: + { + Unified2IDSEvent_legacy *event = (Unified2IDSEvent_legacy *)voidevent; + ACTION_OF_EVENT(e); + } + case 104: + { + Unified2IDSEvent *event = (Unified2IDSEvent *)voidevent; + ACTION_OF_EVENT(e); + } + /* IPV6 pending */ + }; + return NULL; +} + /* * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) * @@ -642,6 +667,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type /*char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"];*/ char buf[sizeof "0000:0000:0000:0000:0000:0000:0000:0000"]; const size_t bufLen = sizeof buf; + const char * str_aux=NULL; KafkaLog * kafka = jsonData->kafka; sfip_t ip; const int initial_buffer_pos = KafkaLog_Tell(jsonData->kafka); @@ -734,6 +760,10 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case TYPE: if(jsonData->sensor_type) KafkaLog_Puts(kafka,jsonData->sensor_type); break; + case ACTION: + if(str_aux = actionOfEvent(event,event_type)) + KafkaLog_Puts(kafka,str_aux); + break; case SIG_GENERATOR: if(event != NULL) KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->generator_id),buf,bufLen)); @@ -1026,13 +1056,13 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case TCPSEQ: if(p->tcph){ // KafkaLog_Print(kafka, "lX%0x",(u_long) ntohl(p->tcph->th_ack)); // hex format - KafkaLog_Puts(kafka,itoa16(ntohl(p->tcph->th_seq),buf,bufLen)); + KafkaLog_Puts(kafka,itoa10(ntohl(p->tcph->th_seq),buf,bufLen)); } break; case TCPACK: if(p->tcph){ // KafkaLog_Print(kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); - KafkaLog_Puts(kafka,itoa16(ntohl(p->tcph->th_ack),buf,bufLen)); + KafkaLog_Puts(kafka,itoa10(ntohl(p->tcph->th_ack),buf,bufLen)); } break; case TCPLEN: @@ -1043,7 +1073,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case TCPWINDOW: if(p->tcph){ //KafkaLog_Print(kafka, "0x%X",ntohs(p->tcph->th_win)); // hex format - KafkaLog_Puts(kafka,itoa16(ntohs(p->tcph->th_win),buf,bufLen)); + KafkaLog_Puts(kafka,itoa10(ntohs(p->tcph->th_win),buf,bufLen)); } break; case TCPFLAGS: From de518d26d9c621630231b31fce5d814b73540058 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Fri, 2 Aug 2013 12:50:35 +0000 Subject: [PATCH 068/198] IPv4 sended in wrong format. Deleted a warning. fwsam did not compile if ipv6 enabled. --- src/output-plugins/spo_alert_fwsam.c | 2 ++ src/output-plugins/spo_alert_json.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/output-plugins/spo_alert_fwsam.c b/src/output-plugins/spo_alert_fwsam.c index 3223274..99afd4d 100644 --- a/src/output-plugins/spo_alert_fwsam.c +++ b/src/output-plugins/spo_alert_fwsam.c @@ -903,7 +903,9 @@ char *inettoa(unsigned long ip) ips.s_addr=ip; toggle=(toggle+1)&3; + #ifndef SUP_IP6 /* redborder change: if not, the project don't compile. remove it. */ strncpy(addr[toggle],inet_ntoa(ips),18); + #endif /* redborder change */ return addr[toggle]; } #endif diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 3cf902b..157746e 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -691,7 +691,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type sfip_set_ip(&ip,GET_SRC_ADDR(p)); #else { - int ipv4 = ntohl(GET_SRC_ADDR(p).s_addr); + int ipv4 = GET_SRC_ADDR(p).s_addr; sfip_set_raw(&ip,&ipv4,AF_INET); } #endif @@ -710,7 +710,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type sfip_set_ip(&ip,GET_DST_ADDR(p)); #else { - int ipv4 = ntohl(GET_DST_ADDR(p).s_addr); + int ipv4 = GET_DST_ADDR(p).s_addr; sfip_set_raw(&ip,&ipv4,AF_INET); } #endif @@ -761,7 +761,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(jsonData->sensor_type) KafkaLog_Puts(kafka,jsonData->sensor_type); break; case ACTION: - if(str_aux = actionOfEvent(event,event_type)) + if((str_aux = actionOfEvent(event,event_type))) KafkaLog_Puts(kafka,str_aux); break; case SIG_GENERATOR: From 2da769a7a2719cd83e5b2034b8b92d0dd9c7979c Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Fri, 2 Aug 2013 13:00:39 +0000 Subject: [PATCH 069/198] Barnyard could wait forever if the kafka broker was down. Fixed. --- src/rbutil/rb_kafka.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index 7c3e7c0..44ce6a6 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -75,7 +75,7 @@ static void KafkaLog_Close (rd_kafka_t* handle) if ( !handle ) return; /* Wait for messaging to finish. */ - while (rd_kafka_outq_len(handle) > 0) + while (rd_kafka_outq_len(handle) > 0 && handle->rk_state!=RD_KAFKA_STATE_DOWN) usleep(50000); /* Since there is no ack for produce messages in 0.7 From 038d63abb79746f32100b6273bcd628ee07a037f Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Fri, 2 Aug 2013 13:05:34 +0000 Subject: [PATCH 070/198] Eth address not printed with all zeroes padding. Fixed. --- src/output-plugins/spo_alert_json.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 157746e..a0146b6 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -620,6 +620,8 @@ static inline void printHWaddr(KafkaLog *kafka,const uint8_t *addr,char * buf,co for(i=0;i<6;++i){ if(i>0) KafkaLog_Putc(kafka,':'); + if(addr[i]<0x10) + KafkaLog_Putc(kafka,'0'); KafkaLog_Puts(kafka, itoa16(addr[i],buf,bufLen)); } } From 55859fcea28eff0756fc49e358a3aba8a7242724 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Wed, 7 Aug 2013 13:47:22 +0000 Subject: [PATCH 071/198] Added kafka 0.8 support --- src/rbutil/rb_kafka.c | 71 ++++++++++++++++++++++++++++++++++++++----- src/rbutil/rb_kafka.h | 5 +++ 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index 44ce6a6..f200f80 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -43,6 +43,7 @@ #include "rb_kafka.h" #include "log.h" #include "util.h" +#include "assert.h" #include "barnyard2.h" @@ -57,16 +58,33 @@ *------------------------------------------------------------------- */ #ifdef HAVE_LIBRDKAFKA -rd_kafka_t* KafkaLog_Open (const char* name) +rd_kafka_t* KafkaLog_Open (const char* brokers) { - if ( !name ) return NULL; - rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, name, NULL); - if(NULL == kafka_handle){ + if ( !brokers ) return NULL; + #if RD_KAFKA_VERSION == 0x00080000 + char errstr[256]; + rd_kafka_conf_t conf; + rd_kafka_defaultconf_set(&conf); + rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, &conf, errstr, sizeof(errstr)); + if(NULL==kafka_handle) + { + perror("kafka_new producer"); + FatalError("Failed to create new producer: %s\n",errstr); + } + if (rd_kafka_brokers_add(kafka_handle, brokers) == 0) + { + FatalError("Kafka: No valid brokers specified\n"); + } + #else + rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, brokers, NULL); + if(NULL == kafka_handle) + { perror("kafka_new producer"); FatalError("There was impossible to allocate a kafka handle."); }else{ kafka_handle->rk_conf.producer.max_outq_msg_cnt = KAFKA_MESSAGES_QUEUE_MAXLEN; } + #endif return kafka_handle; } @@ -75,6 +93,9 @@ static void KafkaLog_Close (rd_kafka_t* handle) if ( !handle ) return; /* Wait for messaging to finish. */ + #if RD_KAFKA_VERSION == 0x00080000 + rd_kafka_poll(handle, 0); + #else while (rd_kafka_outq_len(handle) > 0 && handle->rk_state!=RD_KAFKA_STATE_DOWN) usleep(50000); @@ -83,6 +104,7 @@ static void KafkaLog_Close (rd_kafka_t* handle) * This is fixed in protocol version 0.8 */ //if (sendcnt > 0) usleep(500000); + #endif /* Destroy the handle */ rd_kafka_destroy(handle); @@ -100,7 +122,7 @@ static void KafkaLog_Close (rd_kafka_t* handle) */ KafkaLog* KafkaLog_Init ( const char* broker, unsigned int bufLen, const char * topic, const int start_partition, - const int end_partition, bool open, const char*filename + const int end_partition, bool open /* @TODO Delete in 0.8 */, const char*filename ) { KafkaLog* this; @@ -118,16 +140,33 @@ KafkaLog* KafkaLog_Init ( } this->broker = broker ? SnortStrdup(broker) : NULL; this->topic = topic ? SnortStrdup(topic) : NULL; - this->handler = open ? KafkaLog_Open(this->broker):NULL; + this->handler = + #if RD_KAFKA_VERSION == 0x00080000 + KafkaLog_Open(this->broker); /* don't have any sense dthe delayed open */ + #else + open ? KafkaLog_Open(this->broker):NULL; + #endif + + + + rd_kafka_topic_conf_t topic_conf; + rd_kafka_topic_defaultconf_set(&topic_conf); + this->rkt = rd_kafka_topic_new(this->handler, topic, &topic_conf); + + #if RD_KAFKA_VERSION < 0x00080000 + this->start_partition = this->actual_partition = start_partition; this->end_partition = end_partition; + if(this->start_partition > this->end_partition){ FatalError("alert_json: start_partition > end_partition"); } - this->bufLen = this->start_bufLen = bufLen; #endif + + this->bufLen = this->start_bufLen = bufLen; + #endif /* HAVE_LIBRDKAFKA */ this->textLog = NULL; /* Force NULL by now */ KafkaLog_Reset(this); @@ -172,6 +211,21 @@ bool KafkaLog_Flush(KafkaLog* this) FatalError("There was not possible to solve %s direction",this->broker); } + #if RD_KAFKA_VERSION == 0x00080000 + + rd_kafka_produce(this->rkt, RD_KAFKA_PARTITION_UA, + RD_KAFKA_MSG_F_FREE, + /* Payload and length */ + this->buf, this->pos, + /* Optional key and its length */ + NULL, 0, + /* Message opaque, provided in + * delivery report callback as + * msg_opaque. */ + NULL); + /* Poll to handle delivery reports */ + rd_kafka_poll(this->handler, 10); + #else this->actual_partition++; if(this->actual_partition>this->end_partition) this->actual_partition=this->start_partition; @@ -180,10 +234,11 @@ bool KafkaLog_Flush(KafkaLog* this) free(this->buf); else rd_kafka_produce(this->handler, this->topic, this->actual_partition, RD_KAFKA_OP_F_FREE, this->buf, this->pos); + #endif this->buf = SnortAlloc(sizeof(char)*this->start_bufLen); this->bufLen = this->start_bufLen; - #endif + #endif /* HAVE_LIBRDKAFKA */ if(this->textLog) TextLog_Flush(this->textLog); KafkaLog_Reset(this); diff --git a/src/rbutil/rb_kafka.h b/src/rbutil/rb_kafka.h index fab6fd9..b02b865 100644 --- a/src/rbutil/rb_kafka.h +++ b/src/rbutil/rb_kafka.h @@ -73,9 +73,14 @@ typedef struct _KafkaLog rd_kafka_t * handler; char* broker; char * topic; + #if RD_KAFKA_VERSION == 0x00080000 + rd_kafka_topic_t *rkt; + #endif + #if RD_KAFKA_VERSION < 0x00080000 int start_partition; int end_partition; int actual_partition; + #endif /* buffer attributes: */ From 003086d06ab6b917cca38c4a7393b170652f9445 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Mon, 12 Aug 2013 10:06:49 +0000 Subject: [PATCH 072/198] Workaround to solve bug in librdkafka. --- src/output-plugins/spo_alert_json.c | 2 + src/rbutil/rb_kafka.c | 90 +++++++++++++++++++++-------- 2 files changed, 68 insertions(+), 24 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index a0146b6..8592c35 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -544,6 +544,8 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) KafkaLog_Term(data->kafka); free(data->jsonargs); free(data->sensor_name); + free(data->sensor_type); + free(data->domain); freeNumberStrAssocList(data->hosts); freeNumberStrAssocList(data->nets); freeNumberStrAssocList(data->services); diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index f200f80..60db632 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -53,29 +53,51 @@ #define KAFKA_MESSAGES_QUEUE_MAXLEN (25*1024*1024) + +#ifdef HAVE_LIBRDKAFKA + +/*------------------------------------------------------------------- + * msg_delivered: just a debug function. See rdkafka library example + *------------------------------------------------------------------- + */ +static inline void msg_delivered (rd_kafka_t *rk, + void *payload, size_t len, + int error_code, + void *opaque, void *msg_opaque) { + + if (error_code) + fprintf(stderr,"%% Message delivery failed: %s\n", + rd_kafka_err2str(rk, error_code)); + else + fprintf(stderr,"%% Message delivered (%zd bytes)\n", len); +} + /*------------------------------------------------------------------- * TextLog_Open/Close: open/close associated log file *------------------------------------------------------------------- */ -#ifdef HAVE_LIBRDKAFKA +#if RD_KAFKA_VERSION == 0x00080000 +rd_kafka_t* KafkaLog_Open () +#else rd_kafka_t* KafkaLog_Open (const char* brokers) +#endif /* RD_KAFKA_VERSION */ { - if ( !brokers ) return NULL; #if RD_KAFKA_VERSION == 0x00080000 + char errstr[256]; rd_kafka_conf_t conf; rd_kafka_defaultconf_set(&conf); + conf.producer.dr_cb = msg_delivered; /* debug */ rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, &conf, errstr, sizeof(errstr)); + /*rd_kafka_set_log_level (kafka_handle, LOG_DEBUG);*/ if(NULL==kafka_handle) { perror("kafka_new producer"); FatalError("Failed to create new producer: %s\n",errstr); } - if (rd_kafka_brokers_add(kafka_handle, brokers) == 0) - { - FatalError("Kafka: No valid brokers specified\n"); - } + #else + if ( !brokers ) return NULL; rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, brokers, NULL); if(NULL == kafka_handle) { @@ -84,7 +106,9 @@ rd_kafka_t* KafkaLog_Open (const char* brokers) }else{ kafka_handle->rk_conf.producer.max_outq_msg_cnt = KAFKA_MESSAGES_QUEUE_MAXLEN; } + #endif + return kafka_handle; } @@ -122,11 +146,11 @@ static void KafkaLog_Close (rd_kafka_t* handle) */ KafkaLog* KafkaLog_Init ( const char* broker, unsigned int bufLen, const char * topic, const int start_partition, - const int end_partition, bool open /* @TODO Delete in 0.8 */, const char*filename + const int end_partition, bool open, const char*filename ) { KafkaLog* this; - this = (KafkaLog*)malloc(sizeof(KafkaLog)); + this = (KafkaLog*)SnortAlloc(sizeof(KafkaLog)); #ifdef HAVE_LIBRDKAFKA if(this){ this->buf = malloc(sizeof(char)*bufLen); @@ -140,19 +164,10 @@ KafkaLog* KafkaLog_Init ( } this->broker = broker ? SnortStrdup(broker) : NULL; this->topic = topic ? SnortStrdup(topic) : NULL; - this->handler = - #if RD_KAFKA_VERSION == 0x00080000 - KafkaLog_Open(this->broker); /* don't have any sense dthe delayed open */ - #else - open ? KafkaLog_Open(this->broker):NULL; - #endif + #ifndef RD_KAFKA_VERSION + this->handler = open ? KafkaLog_Open(this->broker):NULL; /* will always start in Flush */ + #endif - - - rd_kafka_topic_conf_t topic_conf; - rd_kafka_topic_defaultconf_set(&topic_conf); - this->rkt = rd_kafka_topic_new(this->handler, topic, &topic_conf); - #if RD_KAFKA_VERSION < 0x00080000 this->start_partition = this->actual_partition = start_partition; @@ -195,6 +210,7 @@ void KafkaLog_Term (KafkaLog* this) } + /*------------------------------------------------------------------- * KafkaLog_Flush: send buffered stream to a kafka server *------------------------------------------------------------------- @@ -205,14 +221,35 @@ bool KafkaLog_Flush(KafkaLog* this) if ( !this->pos ) return FALSE; // In daemon mode, we must start the handler here - if(this->handler==NULL && BcDaemonMode()){ - this->handler = KafkaLog_Open(this->broker); - if(!this->handler) - FatalError("There was not possible to solve %s direction",this->broker); + if(this->handler==NULL && this->broker && this->topic) + { +#if RD_KAFKA_VERSION == 0x00080000 + + this->handler = KafkaLog_Open(); + if(!this->handler) + FatalError("It was not possible create a kafka handler\n",this->broker); + rd_kafka_topic_conf_t topic_conf; + rd_kafka_topic_defaultconf_set(&topic_conf); + this->rkt = rd_kafka_topic_new(this->handler, this->topic, &topic_conf); + if(NULL==this->rkt) + FatalError("It was not possible create a kafka topic %s\n",this->topic); + if (rd_kafka_brokers_add(this->handler, this->broker) == 0) + FatalError("Kafka: No valid brokers specified in %s\n",this->broker); + +#else + + this->handler = KafkaLog_Open(this->broker); + if(!this->handler) + FatalError("There was not possible to solve %s direction",this->broker); + +#endif /* RD_KAFKA_VERSION*/ } + /* rd_kafka_dump(stdout,this->handler); */ + #if RD_KAFKA_VERSION == 0x00080000 + rd_kafka_produce(this->rkt, RD_KAFKA_PARTITION_UA, RD_KAFKA_MSG_F_FREE, /* Payload and length */ @@ -225,7 +262,9 @@ bool KafkaLog_Flush(KafkaLog* this) NULL); /* Poll to handle delivery reports */ rd_kafka_poll(this->handler, 10); + #else + this->actual_partition++; if(this->actual_partition>this->end_partition) this->actual_partition=this->start_partition; @@ -234,11 +273,14 @@ bool KafkaLog_Flush(KafkaLog* this) free(this->buf); else rd_kafka_produce(this->handler, this->topic, this->actual_partition, RD_KAFKA_OP_F_FREE, this->buf, this->pos); + #endif + this->buf = SnortAlloc(sizeof(char)*this->start_bufLen); this->bufLen = this->start_bufLen; #endif /* HAVE_LIBRDKAFKA */ + if(this->textLog) TextLog_Flush(this->textLog); KafkaLog_Reset(this); From e11344dff282cb673d663d943f0ac43151f4ce26 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Thu, 22 Aug 2013 09:41:59 +0000 Subject: [PATCH 073/198] Changed some fields name. --- src/output-plugins/spo_alert_json.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 8592c35..feee298 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,7 +77,7 @@ #include "GeoIP.h" #endif // HAVE_GEOIP -#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,type,sensor_name,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,proto,proto_id,src,src_str,src_name,src_net,src_net_name,dst_name,dst_str,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,type,sensor_name,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,proto,proto_name,src,src_asnum,src_name,src_net,src_net_name,dst_name,dst_asnum,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" @@ -216,8 +216,8 @@ static AlertJSONTemplateElement template[] = { {CLASSIFICATION,"classification","classification",stringFormat,"-"}, {MSG,"msg","msg",stringFormat,"-"}, {PAYLOAD,"payload","payload",stringFormat,"-"}, - {PROTO,"proto","proto",stringFormat,"-"}, - {PROTO_ID,"proto_id","proto_id",numericFormat,"0"}, + {PROTO,"proto_name","proto_name",stringFormat,"-"}, + {PROTO_ID,"proto","proto",numericFormat,"0"}, {ETHSRC,"ethsrc","ethsrc",stringFormat,"-"}, {ETHDST,"ethdst","ethdst",stringFormat,"-"}, {ETHTYPE,"ethtype","ethtype",numericFormat,"0"}, @@ -236,8 +236,8 @@ static AlertJSONTemplateElement template[] = { {SRCPORT_NAME,"srcport_name","srcport_name",stringFormat,"-"}, {DSTPORT,"dstport","dstport",numericFormat,"0"}, {DSTPORT_NAME,"dstport_name","dstport_name",stringFormat,"-"}, - {SRC_TEMPLATE_ID,"src","src",numericFormat,"0"}, - {SRC_STR,"src_str","src_str",stringFormat,"-"}, + {SRC_TEMPLATE_ID,"src_asnum","src_asnum",numericFormat,"0"}, + {SRC_STR,"src","src",stringFormat,"-"}, {SRC_NAME,"src_name","src_name",stringFormat,"-"}, {SRC_NET,"src_net","src_net",stringFormat,"0.0.0.0/0"}, {SRC_NET_NAME,"src_net_name","src_net_name",stringFormat,"0.0.0.0/0"}, From 0665f85f98d245b60de801c81c7348a3d846b9f2 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Fri, 23 Aug 2013 11:16:11 +0000 Subject: [PATCH 074/198] Deleted sensor_id_snort from default template --- src/output-plugins/spo_alert_json.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index feee298..ba75a13 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,7 +77,8 @@ #include "GeoIP.h" #endif // HAVE_GEOIP -#define DEFAULT_JSON "timestamp,sensor_id,sensor_id_snort,type,sensor_name,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,proto,proto_name,src,src_asnum,src_name,src_net,src_net_name,dst_name,dst_asnum,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +// Not including: sensor_id_snort +#define DEFAULT_JSON "timestamp,sensor_id,type,sensor_name,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,proto,proto_name,src,src_asnum,src_name,src_net,src_net_name,dst_name,dst_asnum,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" From 9bc12e3216fb7da3b07e741c9ada790253bb7926 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Fri, 23 Aug 2013 12:18:46 +0000 Subject: [PATCH 075/198] Changed some template elements --- src/output-plugins/spo_alert_json.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index ba75a13..47c8010 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,8 +77,14 @@ #include "GeoIP.h" #endif // HAVE_GEOIP -// Not including: sensor_id_snort -#define DEFAULT_JSON "timestamp,sensor_id,type,sensor_name,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,proto,proto_name,src,src_asnum,src_name,src_net,src_net_name,dst_name,dst_asnum,dst_net,dst_net_name,src_country,dst_country,src_country_code,dst_country_code,srcport,dst,dstport,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +// Not including: sensor_id_snort. +// @TODO find a more elegant way +#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,proto,proto_name,src,src_name,src_net,src_net_name,dst,dst_name,dst_net,dst_net_name,srcport,srcport_name,dstport,dstport_name,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#ifdef HAVE_GEOIP +#define DEFAULT_JSON DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ +#else +#define DEFAULT_JSON DEFAULT_JSON_0 +#endif #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" @@ -100,6 +106,7 @@ typedef enum{ SENSOR_ID_SNORT, SENSOR_ID, SENSOR_NAME, + SENSOR_IP, DOMAIN, DOMAIN_ID, TYPE, @@ -194,7 +201,7 @@ typedef struct _AlertJSONData AlertJSONConfig *config; Number_str_assoc * hosts, *nets, *services, *protocols, *vlans; uint32_t sensor_id,domain_id; - char * sensor_name, *sensor_type,*domain; + char * sensor_name, *sensor_type,*domain,*sensor_ip; #ifdef HAVE_GEOIP GeoIP *gi; #endif @@ -205,6 +212,7 @@ static AlertJSONTemplateElement template[] = { {TIMESTAMP,"timestamp","timestamp",numericFormat,"0"}, {SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat,"0"}, {SENSOR_ID,"sensor_id","sensor_id",numericFormat,"0"}, + {SENSOR_IP,"sensor_ip","sensor_ip",stringFormat,"0"}, {SENSOR_NAME,"sensor_name","sensor_name",stringFormat,"-"}, {DOMAIN,"domain","domain",stringFormat,"-"}, {DOMAIN_ID,"domain_id","domain_id",numericFormat,"-"}, @@ -242,9 +250,9 @@ static AlertJSONTemplateElement template[] = { {SRC_NAME,"src_name","src_name",stringFormat,"-"}, {SRC_NET,"src_net","src_net",stringFormat,"0.0.0.0/0"}, {SRC_NET_NAME,"src_net_name","src_net_name",stringFormat,"0.0.0.0/0"}, - {DST_TEMPLATE_ID,"dst","dst",numericFormat,"0"}, + {DST_TEMPLATE_ID,"dst_asnum","dst_asnum",stringFormat,"0"}, {DST_NAME,"dst_name","dst_name",stringFormat,"-"}, - {DST_STR,"dst_str","dst_str",stringFormat,"-"}, + {DST_STR,"dst","dst",stringFormat,"-"}, {DST_NET,"dst_net","dst_net",stringFormat,"0.0.0.0/0"}, {DST_NET_NAME,"dst_net_name","dst_net_name",stringFormat,"0.0.0.0/0"}, {ICMPTYPE,"icmptype","icmptype",numericFormat,"0"}, @@ -394,6 +402,10 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { data->sensor_id = atol(tok + strlen("sensor_id=")); } + else if(!strncasecmp(tok,"sensor_ip=",strlen("sensor_ip="))) + { + data->sensor_ip = strdup(tok + strlen("sensor_ip=")); + } else if(!strncasecmp(tok,"sensor_type=",strlen("sensor_type="))) { RB_IF_CLEAN(data->sensor_type,data->sensor_type = SnortStrdup(tok + strlen("sensor_type=")),"%s(%i) param setted twice.\n",tok,i); @@ -545,6 +557,7 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) KafkaLog_Term(data->kafka); free(data->jsonargs); free(data->sensor_name); + free(data->sensor_ip); free(data->sensor_type); free(data->domain); freeNumberStrAssocList(data->hosts); @@ -753,6 +766,9 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case SENSOR_ID: KafkaLog_Puts(kafka,itoa10(jsonData->sensor_id,buf,bufLen)); break; + case SENSOR_IP: + if(jsonData->sensor_ip) KafkaLog_Puts(kafka,jsonData->sensor_ip); + break; case SENSOR_NAME: KafkaLog_Puts(kafka,jsonData->sensor_name); break; @@ -931,6 +947,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; }; } + break; case SRCPORT: case DSTPORT: if(IPH_IS_VALID(p)) From a3a04f1dfe5bd827a09004c10f03b1f4abeaccb2 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Mon, 16 Sep 2013 12:04:17 +0000 Subject: [PATCH 076/198] Changed some template names --- src/output-plugins/spo_alert_json.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 47c8010..118571b 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -79,7 +79,7 @@ // Not including: sensor_id_snort. // @TODO find a more elegant way -#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,proto,proto_name,src,src_name,src_net,src_net_name,dst,dst_name,dst_net,dst_net_name,srcport,srcport_name,dstport,dstport_name,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,l4_proto_name,src,src_name,src_net,src_net_name,dst,dst_name,dst_net,dst_net_name,l4_srcport,l4_srcport_name,l4_dstport,l4_dstport_name,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #ifdef HAVE_GEOIP #define DEFAULT_JSON DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ #else @@ -225,8 +225,8 @@ static AlertJSONTemplateElement template[] = { {CLASSIFICATION,"classification","classification",stringFormat,"-"}, {MSG,"msg","msg",stringFormat,"-"}, {PAYLOAD,"payload","payload",stringFormat,"-"}, - {PROTO,"proto_name","proto_name",stringFormat,"-"}, - {PROTO_ID,"proto","proto",numericFormat,"0"}, + {PROTO,"l4_proto_name","l4_proto_name",stringFormat,"-"}, + {PROTO_ID,"l4_proto","l4_proto",numericFormat,"0"}, {ETHSRC,"ethsrc","ethsrc",stringFormat,"-"}, {ETHDST,"ethdst","ethdst",stringFormat,"-"}, {ETHTYPE,"ethtype","ethtype",numericFormat,"0"}, @@ -241,10 +241,10 @@ static AlertJSONTemplateElement template[] = { {UDPLENGTH,"udplength","udplength",numericFormat,"0"}, {ETHLENGTH,"ethlen","ethlength",numericFormat,"0"}, {TRHEADER,"trheader","trheader",stringFormat,"-"}, - {SRCPORT,"srcport","srcport",numericFormat,"0"}, - {SRCPORT_NAME,"srcport_name","srcport_name",stringFormat,"-"}, - {DSTPORT,"dstport","dstport",numericFormat,"0"}, - {DSTPORT_NAME,"dstport_name","dstport_name",stringFormat,"-"}, + {SRCPORT,"l4_srcport","src_port",numericFormat,"0"}, + {SRCPORT_NAME,"l4_srcport_name","src_port_name",stringFormat,"-"}, + {DSTPORT,"l4_dstport","dst_port",numericFormat,"0"}, + {DSTPORT_NAME,"l4_dstport_name","dst_port_name",stringFormat,"-"}, {SRC_TEMPLATE_ID,"src_asnum","src_asnum",numericFormat,"0"}, {SRC_STR,"src","src",stringFormat,"-"}, {SRC_NAME,"src_name","src_name",stringFormat,"-"}, From 37c67a564d7a351cd436f035a172364b220cb429 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Tue, 24 Sep 2013 11:41:42 +0000 Subject: [PATCH 077/198] Deleted kafka 0.8 support. Fixed memory leak. Inserted some likely() optimiz. --- src/rbutil/rb_kafka.c | 142 +++++++++++++++--------------------------- 1 file changed, 50 insertions(+), 92 deletions(-) diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index 60db632..d1fad74 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -44,9 +44,19 @@ #include "log.h" #include "util.h" #include "assert.h" +#include "unistd.h" #include "barnyard2.h" +/* branch predictions */ +#ifdef __GNUC__ +#define likely(x) __builtin_expect(!!(x), 1) +#define unlikely(x) __builtin_expect(!!(x), 0) +#else +#define likely(x) (x) +#define unlikely(x) (x) +#endif + /* some reasonable minimums */ #define MIN_BUF (1*K_BYTES) #define MIN_FILE (MIN_BUF) @@ -72,22 +82,19 @@ static inline void msg_delivered (rd_kafka_t *rk, fprintf(stderr,"%% Message delivered (%zd bytes)\n", len); } +#endif + /*------------------------------------------------------------------- * TextLog_Open/Close: open/close associated log file *------------------------------------------------------------------- */ -#if RD_KAFKA_VERSION == 0x00080000 -rd_kafka_t* KafkaLog_Open () -#else rd_kafka_t* KafkaLog_Open (const char* brokers) -#endif /* RD_KAFKA_VERSION */ { - #if RD_KAFKA_VERSION == 0x00080000 - char errstr[256]; rd_kafka_conf_t conf; rd_kafka_defaultconf_set(&conf); - conf.producer.dr_cb = msg_delivered; /* debug */ + + //conf.producer.dr_cb = msg_delivered; /* debug */ rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, &conf, errstr, sizeof(errstr)); /*rd_kafka_set_log_level (kafka_handle, LOG_DEBUG);*/ if(NULL==kafka_handle) @@ -96,19 +103,6 @@ rd_kafka_t* KafkaLog_Open (const char* brokers) FatalError("Failed to create new producer: %s\n",errstr); } - #else - if ( !brokers ) return NULL; - rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, brokers, NULL); - if(NULL == kafka_handle) - { - perror("kafka_new producer"); - FatalError("There was impossible to allocate a kafka handle."); - }else{ - kafka_handle->rk_conf.producer.max_outq_msg_cnt = KAFKA_MESSAGES_QUEUE_MAXLEN; - } - - #endif - return kafka_handle; } @@ -117,23 +111,24 @@ static void KafkaLog_Close (rd_kafka_t* handle) if ( !handle ) return; /* Wait for messaging to finish. */ - #if RD_KAFKA_VERSION == 0x00080000 - rd_kafka_poll(handle, 0); - #else - while (rd_kafka_outq_len(handle) > 0 && handle->rk_state!=RD_KAFKA_STATE_DOWN) - usleep(50000); - - /* Since there is no ack for produce messages in 0.7 - * we wait some more for any packets to be sent. - * This is fixed in protocol version 0.8 */ - //if (sendcnt > 0) - usleep(500000); - #endif + unsigned throw_msg_count = 10; + unsigned msg_left,prev_msg_left; + while((msg_left = rd_kafka_outq_len (handle) > 0) && throw_msg_count) + { + if(prev_msg_left == msg_left) /* Send no messages in a second? probably, the broker has fall down */ + throw_msg_count--; + else + throw_msg_count = 10; + DEBUG_WRAP(DebugMessage(DEBUG_OUTPUT_PLUGIN, + "[Thread %u] Waiting for messages to send. Still %u messages to be exported. %u retries left.\n");); + prev_msg_left = msg_left; + sleep(1); + //rd_kafka_poll(); + } /* Destroy the handle */ rd_kafka_destroy(handle); } -#endif /*------------------------------------------------------------------- * KafkaLog_Init: constructor @@ -153,7 +148,7 @@ KafkaLog* KafkaLog_Init ( this = (KafkaLog*)SnortAlloc(sizeof(KafkaLog)); #ifdef HAVE_LIBRDKAFKA if(this){ - this->buf = malloc(sizeof(char)*bufLen); + this->buf = SnortAlloc(sizeof(char)*bufLen); if ( !this->buf) { @@ -164,21 +159,6 @@ KafkaLog* KafkaLog_Init ( } this->broker = broker ? SnortStrdup(broker) : NULL; this->topic = topic ? SnortStrdup(topic) : NULL; - #ifndef RD_KAFKA_VERSION - this->handler = open ? KafkaLog_Open(this->broker):NULL; /* will always start in Flush */ - #endif - - #if RD_KAFKA_VERSION < 0x00080000 - - this->start_partition = this->actual_partition = start_partition; - this->end_partition = end_partition; - - - if(this->start_partition > this->end_partition){ - FatalError("alert_json: start_partition > end_partition"); - } - - #endif this->bufLen = this->start_bufLen = bufLen; #endif /* HAVE_LIBRDKAFKA */ @@ -217,40 +197,28 @@ void KafkaLog_Term (KafkaLog* this) */ bool KafkaLog_Flush(KafkaLog* this) { - #if HAVE_LIBRDKAFKA +#if HAVE_LIBRDKAFKA if ( !this->pos ) return FALSE; // In daemon mode, we must start the handler here - if(this->handler==NULL && this->broker && this->topic) + if(unlikely(this->handler==NULL && this->broker && this->topic)) { -#if RD_KAFKA_VERSION == 0x00080000 - - this->handler = KafkaLog_Open(); + this->handler = KafkaLog_Open(this->broker); if(!this->handler) FatalError("It was not possible create a kafka handler\n",this->broker); rd_kafka_topic_conf_t topic_conf; rd_kafka_topic_defaultconf_set(&topic_conf); this->rkt = rd_kafka_topic_new(this->handler, this->topic, &topic_conf); - if(NULL==this->rkt) + if(NULL==this->rkt) FatalError("It was not possible create a kafka topic %s\n",this->topic); if (rd_kafka_brokers_add(this->handler, this->broker) == 0) FatalError("Kafka: No valid brokers specified in %s\n",this->broker); - -#else - - this->handler = KafkaLog_Open(this->broker); - if(!this->handler) - FatalError("There was not possible to solve %s direction",this->broker); - -#endif /* RD_KAFKA_VERSION*/ } /* rd_kafka_dump(stdout,this->handler); */ - #if RD_KAFKA_VERSION == 0x00080000 - - rd_kafka_produce(this->rkt, RD_KAFKA_PARTITION_UA, + if(unlikely(0 != rd_kafka_produce(this->rkt, RD_KAFKA_PARTITION_UA, RD_KAFKA_MSG_F_FREE, /* Payload and length */ this->buf, this->pos, @@ -259,27 +227,17 @@ bool KafkaLog_Flush(KafkaLog* this) /* Message opaque, provided in * delivery report callback as * msg_opaque. */ - NULL); + NULL))) + { + free(this->buf); + } /* Poll to handle delivery reports */ - rd_kafka_poll(this->handler, 10); - - #else - - this->actual_partition++; - if(this->actual_partition>this->end_partition) - this->actual_partition=this->start_partition; - /* This if prevent the memory overflow if the server is down */ - if(this->handler->rk_state == RD_KAFKA_STATE_DOWN) - free(this->buf); - else - rd_kafka_produce(this->handler, this->topic, this->actual_partition, RD_KAFKA_OP_F_FREE, this->buf, this->pos); - - #endif + //rd_kafka_poll(this->handler, 10); this->buf = SnortAlloc(sizeof(char)*this->start_bufLen); this->bufLen = this->start_bufLen; - #endif /* HAVE_LIBRDKAFKA */ +#endif /* HAVE_LIBRDKAFKA */ if(this->textLog) TextLog_Flush(this->textLog); @@ -312,7 +270,7 @@ bool KafkaLog_Putc (KafkaLog* this, char c) */ bool KafkaLog_Write (KafkaLog* this, const char* str, int len) { - #ifdef HAVE_LIBRDKAFKA +#ifdef HAVE_LIBRDKAFKA while ( len >= KafkaLog_Avail(this) ) { this->bufLen*=2; @@ -325,7 +283,7 @@ bool KafkaLog_Write (KafkaLog* this, const char* str, int len) this->pos += len; assert(this->buf[this->pos] == '\0'); - #endif // HAVE_LIBRDKAFKA +#endif // HAVE_LIBRDKAFKA if(this->textLog) TextLog_Write(this->textLog,str,len); return TRUE; } @@ -341,14 +299,14 @@ bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) va_list ap; va_start(ap, fmt); - #ifdef HAVE_LIBRDKAFKA +#ifdef HAVE_LIBRDKAFKA len = vsnprintf(this->buf+this->pos, avail, fmt, ap); - #endif +#endif if(this->textLog) vsnprintf(this->textLog->buf+this->textLog->pos, avail, fmt, ap); va_end(ap); - #ifdef HAVE_LIBRDKAFKA +#ifdef HAVE_LIBRDKAFKA while(len >= avail){ // Send a half json message to Kafka has no sense, so we will try to // increase the buffer's lenght to allocate the full message. @@ -361,7 +319,7 @@ bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) len = vsnprintf(this->buf+this->pos, avail, fmt, ap); va_end(ap); } - #endif +#endif // TextLog's TextLog_Print @@ -387,9 +345,9 @@ bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) { // NOPE! return FALSE; } - #ifdef HAVE_LIBRDKAFKA +#ifdef HAVE_LIBRDKAFKA this->pos += len; - #endif +#endif if(this->textLog) this->textLog->pos += len; return TRUE; } @@ -402,7 +360,7 @@ bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) */ bool KafkaLog_Quote (KafkaLog* this, const char* qs) { - #ifdef HAVE_LIBRDKAFKA +#ifdef HAVE_LIBRDKAFKA int pos = this->pos; if ( KafkaLog_Avail(this) < 3 ) @@ -425,7 +383,7 @@ bool KafkaLog_Quote (KafkaLog* this, const char* qs) this->buf[pos++] = '"'; this->pos = pos; - #endif +#endif if(this->textLog) TextLog_Quote(this->textLog,qs); From 4d4b1057006b0449c86ed7198dcc7e1ef0dfcf42 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Wed, 9 Oct 2013 16:11:14 +0000 Subject: [PATCH 078/198] Updated configure.in --- configure.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure.in b/configure.in index 20ea313..9e193ed 100644 --- a/configure.in +++ b/configure.in @@ -186,7 +186,6 @@ if test "x$enable_kafka" = "x$enableval"; then [ echo "Error: Librdkafka headers not found." echo "You can download and install it from https://github.com/edenhill/librdkafka" - echo "Remember you have to use 0.7 branch" exit 1 ]) @@ -194,12 +193,10 @@ if test "x$enable_kafka" = "x$enableval"; then [ echo "Error: Librdkafka library not found." echo "You can download and install it from https://github.com/edenhill/librdkafka" - echo "Remember you have to use 0.7 branch" exit 1 ]) LDFLAGS="${LDFLAGS} -lrdkafka" - AC_DEFINE([HAVE_RDKAFKA],[],[Have Apache Kafka library]) fi From 3300b022dbe2b97a5bb496b6bb4a04fdfafd4ca2 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Tue, 5 Nov 2013 17:57:58 +0000 Subject: [PATCH 079/198] Added group_id and group_name in the parameters. domain_id renamed to domain_name, and domain->domain_id --- src/output-plugins/spo_alert_json.c | 42 +++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 118571b..f92e351 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -79,7 +79,7 @@ // Not including: sensor_id_snort. // @TODO find a more elegant way -#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain,domain_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,l4_proto_name,src,src_name,src_net,src_net_name,dst,dst_name,dst_net,dst_net_name,l4_srcport,l4_srcport_name,l4_dstport,l4_dstport_name,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,l4_proto_name,src,src_name,src_net,src_net_name,dst,dst_name,dst_net,dst_net_name,l4_srcport,l4_srcport_name,l4_dstport,l4_dstport_name,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" #ifdef HAVE_GEOIP #define DEFAULT_JSON DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ #else @@ -107,8 +107,10 @@ typedef enum{ SENSOR_ID, SENSOR_NAME, SENSOR_IP, - DOMAIN, DOMAIN_ID, + DOMAIN_NAME, + GROUP_ID, + GROUP_NAME, TYPE, SIG_GENERATOR, SIG_ID, @@ -200,8 +202,8 @@ typedef struct _AlertJSONData TemplateElementsList * outputTemplate; AlertJSONConfig *config; Number_str_assoc * hosts, *nets, *services, *protocols, *vlans; - uint32_t sensor_id,domain_id; - char * sensor_name, *sensor_type,*domain,*sensor_ip; + uint32_t sensor_id,domain_id,group_id; + char * sensor_name, *sensor_type,*domain,*sensor_ip,*group_name; #ifdef HAVE_GEOIP GeoIP *gi; #endif @@ -214,8 +216,10 @@ static AlertJSONTemplateElement template[] = { {SENSOR_ID,"sensor_id","sensor_id",numericFormat,"0"}, {SENSOR_IP,"sensor_ip","sensor_ip",stringFormat,"0"}, {SENSOR_NAME,"sensor_name","sensor_name",stringFormat,"-"}, - {DOMAIN,"domain","domain",stringFormat,"-"}, - {DOMAIN_ID,"domain_id","domain_id",numericFormat,"-"}, + {DOMAIN_NAME,"domain_name","domain_name",stringFormat,"-"}, + /* {DOMAIN_ID,"domain_id","domain_id",numericFormat,"-"}, */ + {GROUP_NAME,"group_name","group_name",stringFormat,"-"}, + {GROUP_ID,"group_id","group_id",numericFormat,"-"}, {TYPE,"type","type",stringFormat,"-"}, {ACTION,"action","action",stringFormat,"-"}, {SIG_GENERATOR,"sig_generator","sig_generator",numericFormat,"0"}, @@ -400,11 +404,19 @@ static AlertJSONData *AlertJSONParseArgs(char *args) } else if(!strncasecmp(tok,"sensor_id=",strlen("sensor_id="))) { - data->sensor_id = atol(tok + strlen("sensor_id=")); + data->sensor_id = atol(tok + strlen("sensor_id=")); } else if(!strncasecmp(tok,"sensor_ip=",strlen("sensor_ip="))) { - data->sensor_ip = strdup(tok + strlen("sensor_ip=")); + data->sensor_ip = strdup(tok + strlen("sensor_ip=")); + } + else if(!strncasecmp(tok,"group_id=",strlen("group_id="))) + { + data->group_id = atol(tok + strlen("group_id=")); + } + else if(!strncasecmp(tok,"group_name=",strlen("group_name="))) + { + data->group_name = strdup(tok + strlen("group_name=")); } else if(!strncasecmp(tok,"sensor_type=",strlen("sensor_type="))) { @@ -438,14 +450,16 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { end_partition = atol(tok+strlen("end_partition=")); } - else if(!strncasecmp(tok,"domain=",strlen("domain="))) + else if(!strncasecmp(tok,"domain_name=",strlen("domain_name="))) { - RB_IF_CLEAN(data->domain, data->domain = SnortStrdup(tok+strlen("domain=")),"%s(%i) param setted twice.\n",tok,i); + RB_IF_CLEAN(data->domain, data->domain = SnortStrdup(tok+strlen("domain_name=")),"%s(%i) param setted twice.\n",tok,i); } + #if 0 else if(!strncasecmp(tok,"domain_id=",strlen("domain_id="))) { data->domain_id = atol(tok+strlen("domain_id=")); } + #endif #ifdef HAVE_GEOIP else if(!strncasecmp(tok,"geoip=",strlen("geoip="))) { @@ -772,12 +786,18 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case SENSOR_NAME: KafkaLog_Puts(kafka,jsonData->sensor_name); break; - case DOMAIN: + case DOMAIN_NAME: if(jsonData->domain) KafkaLog_Puts(kafka,jsonData->domain); break; case DOMAIN_ID: KafkaLog_Puts(kafka,itoa10(jsonData->domain_id,buf,bufLen)); break; + case GROUP_NAME: + if(jsonData->group_name) KafkaLog_Puts(kafka,jsonData->group_name); + break; + case GROUP_ID: + KafkaLog_Puts(kafka,itoa10(jsonData->group_id,buf,bufLen)); + break; case TYPE: if(jsonData->sensor_type) KafkaLog_Puts(kafka,jsonData->sensor_type); break; From a50d5ccdd103273ac05a94ec6b54e016210df4d6 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Tue, 19 Nov 2013 16:51:59 +0000 Subject: [PATCH 080/198] IP packets length and ethernet packets length are now aggregated in groups. Priority_name added. --- configure.in | 38 +++++++++++ src/output-plugins/spo_alert_json.c | 102 +++++++++++++++++++++++++++- src/rbutil/rb_numstrpair_list.c | 37 +++++++++- src/rbutil/rb_numstrpair_list.h | 4 +- 4 files changed, 177 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 9e193ed..9631e47 100644 --- a/configure.in +++ b/configure.in @@ -199,6 +199,44 @@ if test "x$enable_kafka" = "x$enableval"; then LDFLAGS="${LDFLAGS} -lrdkafka" fi +AC_ARG_WITH(rd_includes, + [ --with-rd-includes=DIR rd include directory], + [with_rd_includes="$withval"],[with_rd_includes="no"]) + +AC_ARG_WITH(rd_libraries, + [ --with-rdkfaka-libraries=DIR rd library directory], + [with_rd_libraries="$withval"],[with_rd_libraries="no"]) + +if test "x$with_rd_includes" != "xno"; then + CFLAGS="${CFLAGS} -I${with_rd_includes}" +fi + +if test "x$with_rd_libraries" != "xno"; then + LDFLAGS="${LDFLAGS} -L${with_rd_libraries}" +fi + +AC_ARG_ENABLE(rd, +[ --enable-rd Enable librd extensions.], + enable_rd="$enableval", enable_rd="no") + +if test "x$enable_rd" = "x$enableval"; then + AC_CHECK_HEADERS([librd/rd.h],[], + [ + echo "Error: Librd headers not found." + echo "You can download and install it from https://github.com/edenhill/librd" + exit 1 + ]) + + AC_CHECK_LIB(rd,rd_init,[], + [ + echo "Error: Librd library not found." + echo "You can download and install it from https://github.com/edenhill/librd" + exit 1 + ]) + + LDFLAGS="${LDFLAGS} -lrd" +fi + # AC_PROG_YACC defaults to "yacc" when not found # this check defaults to "none" diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index f92e351..8884606 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -77,9 +77,16 @@ #include "GeoIP.h" #endif // HAVE_GEOIP +#ifdef HAVE_LIBRD +#include "librd/rd.h" +#endif + +#include "math.h" + + // Not including: sensor_id_snort. // @TODO find a more elegant way -#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,l4_proto_name,src,src_name,src_net,src_net_name,dst,dst_name,dst_net,dst_net_name,l4_srcport,l4_srcport_name,l4_dstport,l4_dstport_name,ethsrc,ethdst,ethlen,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,priority_name,classification,action,msg,payload,l4_proto,l4_proto_name,src,src_name,src_net,src_net_name,dst,dst_name,dst_net,dst_net_name,l4_srcport,l4_srcport_name,l4_dstport,l4_dstport_name,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" #ifdef HAVE_GEOIP #define DEFAULT_JSON DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ #else @@ -116,6 +123,7 @@ typedef enum{ SIG_ID, SIG_REV, PRIORITY, + PRIORITY_NAME, ACTION, CLASSIFICATION, MSG, @@ -135,6 +143,7 @@ typedef enum{ ARP_HW_TPROT, /* Destination ARP Hardware Protocol */ UDPLENGTH, ETHLENGTH, + ETHLENGTH_RANGE, TRHEADER, SRCPORT, DSTPORT, @@ -158,6 +167,7 @@ typedef enum{ TOS, ID, IPLEN, + IPLEN_RANGE, DGMLEN, TCPSEQ, TCPACK, @@ -204,6 +214,8 @@ typedef struct _AlertJSONData Number_str_assoc * hosts, *nets, *services, *protocols, *vlans; uint32_t sensor_id,domain_id,group_id; char * sensor_name, *sensor_type,*domain,*sensor_ip,*group_name; + #define MAX_PRIORITIES 16 + char * priority_name[MAX_PRIORITIES]; #ifdef HAVE_GEOIP GeoIP *gi; #endif @@ -226,6 +238,7 @@ static AlertJSONTemplateElement template[] = { {SIG_ID,"sig_id","sig_id",numericFormat,"0"}, {SIG_REV,"sig_rev","rev",numericFormat,"0"}, {PRIORITY,"priority","priority",numericFormat,"0"}, + {PRIORITY_NAME,"priority_name","priority_name",stringFormat,"0"}, {CLASSIFICATION,"classification","classification",stringFormat,"-"}, {MSG,"msg","msg",stringFormat,"-"}, {PAYLOAD,"payload","payload",stringFormat,"-"}, @@ -244,6 +257,7 @@ static AlertJSONTemplateElement template[] = { {VLAN_DROP,"vlan_drop","vlan_drop",numericFormat,"0"}, {UDPLENGTH,"udplength","udplength",numericFormat,"0"}, {ETHLENGTH,"ethlen","ethlength",numericFormat,"0"}, + {ETHLENGTH_RANGE,"ethlength_range","ethlength_range",stringFormat,"0"}, {TRHEADER,"trheader","trheader",stringFormat,"-"}, {SRCPORT,"l4_srcport","src_port",numericFormat,"0"}, {SRCPORT_NAME,"l4_srcport_name","src_port_name",stringFormat,"-"}, @@ -267,6 +281,7 @@ static AlertJSONTemplateElement template[] = { {TOS,"tos","tos",numericFormat,"0"}, {ID,"id","id",numericFormat,"0"}, {IPLEN,"iplen","iplen",numericFormat,"0"}, + {IPLEN_RANGE,"iplen_range","iplen_range",stringFormat,"0"}, {DGMLEN,"dgmlen","dgmlen",numericFormat,"0"}, {TCPSEQ,"tcpseq","tcpseq",numericFormat,"0"}, {TCPACK,"tcpack","tcpack",numericFormat,"0"}, @@ -363,7 +378,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) char* filename = NULL; char* kafka_str = NULL; int i; - char* hostsListPath = NULL,*networksPath = NULL,*servicesPath = NULL,*protocolsPath = NULL,*vlansPath=NULL; + char* hostsListPath = NULL,*networksPath = NULL,*servicesPath = NULL,*protocolsPath = NULL,*vlansPath=NULL,*prioritiesPath=NULL; #ifdef HAVE_GEOIP char * geoIP_path = NULL; #endif @@ -438,6 +453,10 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { RB_IF_CLEAN(protocolsPath, protocolsPath = SnortStrdup(tok+strlen("protocols=")),"%s(%i) param setted twice.\n",tok,i); } + else if(!strncasecmp(tok,"priorities=",strlen("priorities="))) + { + RB_IF_CLEAN(prioritiesPath, prioritiesPath = SnortStrdup(tok+strlen("priorities=")),"%s(%i) param setted twice.\n",tok,i); + } else if(!strncasecmp(tok,"vlans=",strlen("vlans"))) { RB_IF_CLEAN(vlansPath, vlansPath = SnortStrdup(tok+strlen("vlans=")),"%s(%i) param setted twice.\n",tok,i); @@ -446,6 +465,27 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { start_partition = end_partition = atol(tok+strlen("start_partition=")); } + #if 0 + else if(!strncasecmp(tok,"object_files=",strlen("object_files="))) + { + #ifdef HAVE_LIBRD + RB_IF_CLEAN(data->objects_path,data->objects_path = SnortStrdup(tok+strlen("objects_files=")),"%s(%i) param setted twice.\n",tok,i); + #else + FatalError("objects_files can only be setted if --enable-librd has been setted in configuration.\n") + #endif + } + else if(!strncasecmp(tok,"ethlength_ranges=",strlen("ethlength_ranges="))) + { + unsigned num_intervals_limits,i=0; + char ** limits = mSplit((char *)tok+strlen("ethlength_ranges"), ",", 0, &num_intervals_limits, '\\'); + data->eth_range_lengths = SnortAlloc(num_intervals_limits+1); + for(i=0;ieth_range_lengths[i]=atoi(limits); + } + data->eth_range_lengths[num_intervals_limits]=0; + } + #endif else if(!strncasecmp(tok,"end_partition=",strlen("end_partition="))) { end_partition = atol(tok+strlen("end_partition=")); @@ -485,6 +525,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) if(servicesPath) FillHostsList(servicesPath,&data->services,SERVICES); if(protocolsPath) FillHostsList(protocolsPath,&data->protocols,PROTOCOLS); if(vlansPath) FillHostsList(vlansPath,&data->vlans,VLANS); + if(prioritiesPath) FillFixLengthList(prioritiesPath,data->priority_name,MAX_PRIORITIES); mSplitFree(&toks, num_toks); toks = mSplit(data->jsonargs, ",", 128, &num_toks, 0); @@ -817,6 +858,16 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(event != NULL) KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->signature_revision),buf,bufLen)); break; + case PRIORITY_NAME: + { + const uint32_t prio = event?ntohl(((Unified2EventCommon *)event)->priority_id):MAX_PRIORITIES; + if( event && priopriority_name[prio]) + { + KafkaLog_Puts(kafka,jsonData->priority_name[prio]); + break; + } + } + /* don't break*/; case PRIORITY: KafkaLog_Puts(kafka,event? itoa10(ntohl(((Unified2EventCommon *)event)->priority_id),buf,bufLen): templateElement->defaultValue); break; @@ -926,6 +977,40 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type } break; + case ETHLENGTH_RANGE: + if(p->eh){ + if(p->pkth->len==0) + KafkaLog_Write(kafka, "0",sizeof("0")-1); + if(p->pkth->len<=64) + KafkaLog_Write(kafka, "(0-64]",sizeof("(0-64]")-1); + else if(p->pkth->len<=128) + KafkaLog_Write(kafka, "(64-128]",sizeof("(64-128]")-1); + else if(p->pkth->len<=256) + KafkaLog_Write(kafka, "(128-256]",sizeof("(128-256]")-1); + else if(p->pkth->len<=512) + KafkaLog_Write(kafka, "(256-512]",sizeof("(256-512]")-1); + else if(p->pkth->len<=768) + KafkaLog_Write(kafka, "(512-768]",sizeof("(512-768]")-1); + else if(p->pkth->len<=1024) + KafkaLog_Write(kafka, "(768-1024]",sizeof("(768-1024]")-1); + else if(p->pkth->len<=1280) + KafkaLog_Write(kafka, "(1024-1280]",sizeof("(1024-1280]")-1); + else if(p->pkth->len<=1514) + KafkaLog_Write(kafka, "(1280-1514]",sizeof("(1280-1514]")-1); + else if(p->pkth->len<=2048) + KafkaLog_Write(kafka, "(1514-2048]",sizeof("(1514-2048]")-1); + else if(p->pkth->len<=4096) + KafkaLog_Write(kafka, "(2048-4096]",sizeof("(2048-4096]")-1); + else if(p->pkth->len<=8192) + KafkaLog_Write(kafka, "(4096-8192]",sizeof("(4096-8192]")-1); + else if(p->pkth->len<=16384) + KafkaLog_Write(kafka, "(8192-16384]",sizeof("(8192-16384]")-1); + else if(p->pkth->len<=32768) + KafkaLog_Write(kafka, "(16384-32768]",sizeof("(16384-32768]")-1); + else + KafkaLog_Write(kafka, ">32768",sizeof(">32768")-1); + } + case VLAN_PRIORITY: if(p->vh) KafkaLog_Puts(kafka,itoa10(VTH_PRIORITY(p->vh),buf,bufLen)); @@ -1088,6 +1173,19 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(IPH_IS_VALID(p)) KafkaLog_Puts(kafka,itoa10(GET_IPH_LEN(p) << 2,buf,bufLen)); break; + case IPLEN_RANGE: + if(IPH_IS_VALID(p)) + { + const double borrar = log2(8); + const double log2_len = log2(GET_IPH_LEN(p) << 2); + const unsigned int lower_limit = pow(2.0,floor(log2_len)); + const unsigned int upper_limit = pow(2.0,ceil(log2_len)); + //printf("log2_len: %0lf; floor: %0lf; ceil: %0lf; low_limit: %0lf; upper_limit:%0lf\n", + // log2_len,floor(log2_len),ceil(log2_len),pow(floor(log2_len),2.0),pow(ceil(log2_len),2)); + KafkaLog_Print(kafka,"[%u-%u)",lower_limit,upper_limit); + //printf(kafka,"[%lf-%lf)\n",lower_limit,upper_limit); + } + break; case DGMLEN: if(IPH_IS_VALID(p)){ // XXX might cause a bug when IPv6 is printed? diff --git a/src/rbutil/rb_numstrpair_list.c b/src/rbutil/rb_numstrpair_list.c index 8cc084f..5a1278a 100644 --- a/src/rbutil/rb_numstrpair_list.c +++ b/src/rbutil/rb_numstrpair_list.c @@ -33,7 +33,6 @@ #include #include "rb_numstrpair_list.h" #include "barnyard2.h" -#include "util.h" #include "mstring.h" @@ -96,6 +95,9 @@ static Number_str_assoc * FillHostList_Node(char *line_buffer, FILLHOSTSLIST_MOD break; case VLANS: node->number.vlan = atoi(node->number_as_str); + break; + default: + FatalError("Value not handled in %s %s(%d)",__FUNCTION__,__FILE__,__LINE__); break; }; mSplitFree(&toks, num_toks); @@ -136,5 +138,38 @@ void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOS } } + fclose(file); +} + +void FillFixLengthList(const char *filename,char ** list,const int listlen) +{ + char line_buffer[1024]; + FILE * file; + int aok=1; + int num_toks=0; + char ** toks=NULL; + + if((file = fopen(filename, "r")) == NULL) + { + FatalError("fopen() alert file %s: %s\n",filename, strerror(errno)); + } + + while(NULL != fgets(line_buffer,1024,file) && aok){ + if(line_buffer[0]!='#' && line_buffer[0]!='\n'){ + if((toks = mSplit((char *)line_buffer, " \t", 2, &num_toks, '\\'))){ + int number = atoi(toks[1]); + if(number Date: Thu, 21 Nov 2013 09:14:11 +0000 Subject: [PATCH 081/198] Added AS numbers --- src/output-plugins/spo_alert_json.c | 88 +++++++++++++++++++++++++++-- src/rbutil/rb_numstrpair_list.h | 6 ++ 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 8884606..d7732b7 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -86,7 +86,7 @@ // Not including: sensor_id_snort. // @TODO find a more elegant way -#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,priority_name,classification,action,msg,payload,l4_proto,l4_proto_name,src,src_name,src_net,src_net_name,dst,dst_name,dst_net,dst_net_name,l4_srcport,l4_srcport_name,l4_dstport,l4_dstport_name,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,priority_name,classification,action,msg,payload,l4_proto,l4_proto_name,src,src_name,src_net,src_net_name,src_as,src_as_name,dst,dst_name,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_srcport_name,l4_dstport,l4_dstport_name,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" #ifdef HAVE_GEOIP #define DEFAULT_JSON DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ #else @@ -180,6 +180,10 @@ typedef enum{ DST_COUNTRY, SRC_COUNTRY_CODE, DST_COUNTRY_CODE, + SRC_AS, + DST_AS, + SRC_AS_NAME, + DST_AS_NAME, #endif // HAVE_GEOIP TEMPLATE_END_ID @@ -217,7 +221,7 @@ typedef struct _AlertJSONData #define MAX_PRIORITIES 16 char * priority_name[MAX_PRIORITIES]; #ifdef HAVE_GEOIP - GeoIP *gi; + GeoIP *gi,*gi_org; #endif } AlertJSONData; @@ -293,6 +297,10 @@ static AlertJSONTemplateElement template[] = { {DST_COUNTRY,"dst_country","dst_country",stringFormat,"N/A"}, {SRC_COUNTRY_CODE,"src_country_code","src_country_code",stringFormat,"N/A"}, {DST_COUNTRY_CODE,"dst_country_code","dst_country_code",stringFormat,"N/A"}, + {SRC_AS,"src_as","src_as",numericFormat, 0}, + {DST_AS,"dst_as","dst_as",numericFormat, 0}, + {SRC_AS_NAME,"src_as_name","src_as_name",stringFormat,"N/A"}, + {DST_AS_NAME,"dst_as_name","dst_as_name",stringFormat,"N/A"}, #endif /* HAVE_GEOIP */ {TEMPLATE_END_ID,"","",numericFormat,"0"} }; @@ -381,6 +389,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) char* hostsListPath = NULL,*networksPath = NULL,*servicesPath = NULL,*protocolsPath = NULL,*vlansPath=NULL,*prioritiesPath=NULL; #ifdef HAVE_GEOIP char * geoIP_path = NULL; + char * geoIP_org_path = NULL; #endif int start_partition=KAFKA_PARTITION,end_partition=KAFKA_PARTITION; @@ -505,6 +514,10 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { RB_IF_CLEAN(geoIP_path,geoIP_path = SnortStrdup(tok+strlen("geoip=")),"%s(%i) param setted twice.\n",tok,i); } + else if(!strncasecmp(tok,"geoip_org=",strlen("geoip_org="))) + { + RB_IF_CLEAN(geoIP_org_path,geoIP_org_path = SnortStrdup(tok+strlen("geoip_org=")),"%s(%i) param setted twice.\n",tok,i); + } #endif // HAVE_GEOIP else { @@ -560,6 +573,18 @@ static AlertJSONData *AlertJSONParseArgs(char *args) DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: No geoip database specified.\n");); } + if(geoIP_org_path) + { + data->gi_org = GeoIP_open(geoIP_org_path, GEOIP_MEMORY_CACHE); + + if (data->gi_org == NULL) + FatalError("alert_json: Error opening database %s\n",geoIP_org_path); + else + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: Success opening geoip database: %s\n", geoIP_org_path);); + }else{ + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: No geoip organization database specified.\n");); + } + #endif // HAVE_GEOIP DEBUG_WRAP(DebugMessage( @@ -590,9 +615,11 @@ static AlertJSONData *AlertJSONParseArgs(char *args) if( networksPath ) free (networksPath); if( servicesPath ) free (servicesPath); if( protocolsPath ) free (protocolsPath); + if( prioritiesPath ) free (prioritiesPath); if( vlansPath ) free(vlansPath); #ifdef HAVE_GEOIP if (geoIP_path) free(geoIP_path); + if (geoIP_org_path) free(geoIP_org_path); #endif @@ -614,12 +641,14 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) free(data->sensor_name); free(data->sensor_ip); free(data->sensor_type); + free(data->group_name); free(data->domain); freeNumberStrAssocList(data->hosts); freeNumberStrAssocList(data->nets); freeNumberStrAssocList(data->services); freeNumberStrAssocList(data->protocols); freeNumberStrAssocList(data->vlans); + freeFixLengthList(data->priority_name,MAX_PRIORITIES); for(iter=data->outputTemplate;iter;iter=aux){ aux = iter->next; free(iter); @@ -627,7 +656,8 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) #ifdef HAVE_GEOIP - GeoIP_delete(data->gi); + if(data->gi) GeoIP_delete(data->gi); + if(data->gi_org) GeoIP_delete(data->gi_org); #endif // GWO_IP /* free memory from SpoJSONData */ free(data); @@ -746,6 +776,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type const int initial_buffer_pos = KafkaLog_Tell(jsonData->kafka); #ifdef HAVE_GEOIP geoipv6_t ipv6; + char * as_name=NULL; #endif /* Avoid repeated code */ @@ -759,6 +790,8 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type #ifdef HAVE_GEOIP case SRC_COUNTRY: case SRC_COUNTRY_CODE: + case SRC_AS: + case SRC_AS_NAME: #endif #ifdef SUP_IP6 sfip_set_ip(&ip,GET_SRC_ADDR(p)); @@ -778,6 +811,8 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type #ifdef HAVE_GEOIP case DST_COUNTRY: case DST_COUNTRY_CODE: + case DST_AS: + case DST_AS_NAME: #endif #ifdef SUP_IP6 sfip_set_ip(&ip,GET_DST_ADDR(p)); @@ -805,6 +840,27 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; }; } + + if(IPH_IS_VALID(p)) + { + switch(templateElement->id) + { + case SRC_AS: + case SRC_AS_NAME: + case DST_AS: + case DST_AS_NAME: + if(jsonData->gi_org) + { + if(ip.family == AF_INET) + as_name = GeoIP_name_by_ipnum(jsonData->gi_org,ip.ip32[0]); + else + as_name = GeoIP_name_by_ipnum_v6(jsonData->gi_org,ipv6); + } + break; + default: + break; + }; + } #endif } @@ -1122,6 +1178,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type KafkaLog_Puts(kafka,country_name?country_name:templateElement->defaultValue); } break; + case SRC_COUNTRY_CODE: case DST_COUNTRY_CODE: if(jsonData->gi){ @@ -1133,6 +1190,27 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type KafkaLog_Puts(kafka,country_name?country_name:templateElement->defaultValue); } break; + + case SRC_AS: + case DST_AS: + if(as_name) + { + const char * space = strchr(as_name,' '); + if(space) + KafkaLog_Write(kafka,as_name+2,space - &as_name[2]); + } + break; + + case SRC_AS_NAME: + case DST_AS_NAME: + if(as_name) + { + const char * space = strchr(as_name,' '); + if(space) + KafkaLog_Puts(kafka,space+1); + } + break; + #endif /* HAVE_GEOIP */ case ICMPTYPE: @@ -1176,7 +1254,6 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case IPLEN_RANGE: if(IPH_IS_VALID(p)) { - const double borrar = log2(8); const double log2_len = log2(GET_IPH_LEN(p) << 2); const unsigned int lower_limit = pow(2.0,floor(log2_len)); const unsigned int upper_limit = pow(2.0,ceil(log2_len)); @@ -1229,6 +1306,9 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; }; + if(as_name) + free(as_name); + return KafkaLog_Tell(kafka)-initial_buffer_pos; /* if we have write something */ } diff --git a/src/rbutil/rb_numstrpair_list.h b/src/rbutil/rb_numstrpair_list.h index eea23ba..4a776c4 100644 --- a/src/rbutil/rb_numstrpair_list.h +++ b/src/rbutil/rb_numstrpair_list.h @@ -47,6 +47,12 @@ typedef enum{HOSTS,NETWORKS,SERVICES,PROTOCOLS,VLANS,PRIORITIES} FILLHOSTSLIST_M void freeNumberStrAssocList(Number_str_assoc * nstrList); void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOSTSLIST_MODE mode); void FillFixLengthList(const char *filename,char ** list,const int listlen); +static inline void freeFixLengthList(char ** list,const int listlen) +{ + int i; + for(i=0;i Date: Thu, 21 Nov 2013 09:48:17 +0000 Subject: [PATCH 082/198] Changed Fatal errors to error messages. --- src/output-plugins/spo_alert_json.c | 4 ++-- src/rbutil/rb_numstrpair_list.c | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index d7732b7..c2fff2f 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -566,7 +566,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->gi = GeoIP_open(geoIP_path, GEOIP_MEMORY_CACHE); if (data->gi == NULL) - FatalError("alert_json: Error opening database %s\n",geoIP_path); + ErrorMessage("alert_json: Error opening database %s\n",geoIP_path); else DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: Success opening geoip database: %s\n", geoIP_path);); }else{ @@ -578,7 +578,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->gi_org = GeoIP_open(geoIP_org_path, GEOIP_MEMORY_CACHE); if (data->gi_org == NULL) - FatalError("alert_json: Error opening database %s\n",geoIP_org_path); + ErrorMessage("alert_json: Error opening database %s\n",geoIP_org_path); else DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: Success opening geoip database: %s\n", geoIP_org_path);); }else{ diff --git a/src/rbutil/rb_numstrpair_list.c b/src/rbutil/rb_numstrpair_list.c index 5a1278a..249dab8 100644 --- a/src/rbutil/rb_numstrpair_list.c +++ b/src/rbutil/rb_numstrpair_list.c @@ -97,7 +97,7 @@ static Number_str_assoc * FillHostList_Node(char *line_buffer, FILLHOSTSLIST_MOD node->number.vlan = atoi(node->number_as_str); break; default: - FatalError("Value not handled in %s %s(%d)",__FUNCTION__,__FILE__,__LINE__); + ErrorMessage("Value not handled in %s %s(%d)",__FUNCTION__,__FILE__,__LINE__); break; }; mSplitFree(&toks, num_toks); @@ -123,7 +123,7 @@ void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOS if((file = fopen(filename, "r")) == NULL) { - FatalError("fopen() alert file %s: %s\n",filename, strerror(errno)); + ErrorMessage("fopen() alert file %s: %s\n",filename, strerror(errno)); } Number_str_assoc ** llinst_iterator = list; @@ -131,10 +131,15 @@ void FillHostsList(const char * filename,Number_str_assoc ** list, const FILLHOS if(line_buffer[0]!='#' && line_buffer[0]!='\n'){ Number_str_assoc * ip_str= FillHostList_Node(line_buffer,mode); if(ip_str==NULL) - FatalError("alert_json: cannot parse '%s' line in '%s' file\n",line_buffer,filename); - *llinst_iterator = ip_str; - llinst_iterator = &ip_str->next; - ip_str->next=NULL; + { + ErrorMessage("alert_json: cannot parse '%s' line in '%s' file\n",line_buffer,filename); + } + else + { + *llinst_iterator = ip_str; + llinst_iterator = &ip_str->next; + ip_str->next=NULL; + } } } @@ -151,7 +156,7 @@ void FillFixLengthList(const char *filename,char ** list,const int listlen) if((file = fopen(filename, "r")) == NULL) { - FatalError("fopen() alert file %s: %s\n",filename, strerror(errno)); + ErrorMessage("fopen() alert file %s: %s\n",filename, strerror(errno)); } while(NULL != fgets(line_buffer,1024,file) && aok){ From 770955cda4326f2f811d09113a4e3ca1cef9d6bf Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Thu, 28 Nov 2013 16:06:34 +0000 Subject: [PATCH 083/198] Update to current kafka api --- src/rbutil/rb_kafka.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index d1fad74..bfc9373 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -77,7 +77,7 @@ static inline void msg_delivered (rd_kafka_t *rk, if (error_code) fprintf(stderr,"%% Message delivery failed: %s\n", - rd_kafka_err2str(rk, error_code)); + rd_kafka_err2str(error_code)); else fprintf(stderr,"%% Message delivered (%zd bytes)\n", len); } @@ -91,11 +91,10 @@ static inline void msg_delivered (rd_kafka_t *rk, rd_kafka_t* KafkaLog_Open (const char* brokers) { char errstr[256]; - rd_kafka_conf_t conf; - rd_kafka_defaultconf_set(&conf); + rd_kafka_conf_t * conf = rd_kafka_conf_new(); //conf.producer.dr_cb = msg_delivered; /* debug */ - rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, &conf, errstr, sizeof(errstr)); + rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, conf, errstr, sizeof(errstr)); /*rd_kafka_set_log_level (kafka_handle, LOG_DEBUG);*/ if(NULL==kafka_handle) { @@ -206,9 +205,8 @@ bool KafkaLog_Flush(KafkaLog* this) this->handler = KafkaLog_Open(this->broker); if(!this->handler) FatalError("It was not possible create a kafka handler\n",this->broker); - rd_kafka_topic_conf_t topic_conf; - rd_kafka_topic_defaultconf_set(&topic_conf); - this->rkt = rd_kafka_topic_new(this->handler, this->topic, &topic_conf); + rd_kafka_topic_conf_t * topic_conf = rd_kafka_topic_conf_new(); + this->rkt = rd_kafka_topic_new(this->handler, this->topic, topic_conf); if(NULL==this->rkt) FatalError("It was not possible create a kafka topic %s\n",this->topic); if (rd_kafka_brokers_add(this->handler, this->broker) == 0) From d24420dd69cfd23edf910498a2b9b6d2268b5f74 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Thu, 5 Dec 2013 11:10:05 +0000 Subject: [PATCH 084/198] FIX sometimes print a *0 when printing ethlength. --- src/output-plugins/spo_alert_json.c | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index c2fff2f..c7669db 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1036,35 +1036,35 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case ETHLENGTH_RANGE: if(p->eh){ if(p->pkth->len==0) - KafkaLog_Write(kafka, "0",sizeof("0")-1); + KafkaLog_Puts(kafka, "0"); if(p->pkth->len<=64) - KafkaLog_Write(kafka, "(0-64]",sizeof("(0-64]")-1); + KafkaLog_Puts(kafka, "(0-64]"); else if(p->pkth->len<=128) - KafkaLog_Write(kafka, "(64-128]",sizeof("(64-128]")-1); + KafkaLog_Puts(kafka, "(64-128]"); else if(p->pkth->len<=256) - KafkaLog_Write(kafka, "(128-256]",sizeof("(128-256]")-1); + KafkaLog_Puts(kafka, "(128-256]"); else if(p->pkth->len<=512) - KafkaLog_Write(kafka, "(256-512]",sizeof("(256-512]")-1); + KafkaLog_Puts(kafka, "(256-512]"); else if(p->pkth->len<=768) - KafkaLog_Write(kafka, "(512-768]",sizeof("(512-768]")-1); + KafkaLog_Puts(kafka, "(512-768]"); else if(p->pkth->len<=1024) - KafkaLog_Write(kafka, "(768-1024]",sizeof("(768-1024]")-1); + KafkaLog_Puts(kafka, "(768-1024]"); else if(p->pkth->len<=1280) - KafkaLog_Write(kafka, "(1024-1280]",sizeof("(1024-1280]")-1); + KafkaLog_Puts(kafka, "(1024-1280]"); else if(p->pkth->len<=1514) - KafkaLog_Write(kafka, "(1280-1514]",sizeof("(1280-1514]")-1); + KafkaLog_Puts(kafka, "(1280-1514]"); else if(p->pkth->len<=2048) - KafkaLog_Write(kafka, "(1514-2048]",sizeof("(1514-2048]")-1); + KafkaLog_Puts(kafka, "(1514-2048]"); else if(p->pkth->len<=4096) - KafkaLog_Write(kafka, "(2048-4096]",sizeof("(2048-4096]")-1); + KafkaLog_Puts(kafka, "(2048-4096]"); else if(p->pkth->len<=8192) - KafkaLog_Write(kafka, "(4096-8192]",sizeof("(4096-8192]")-1); + KafkaLog_Puts(kafka, "(4096-8192]"); else if(p->pkth->len<=16384) - KafkaLog_Write(kafka, "(8192-16384]",sizeof("(8192-16384]")-1); + KafkaLog_Puts(kafka, "(8192-16384]"); else if(p->pkth->len<=32768) - KafkaLog_Write(kafka, "(16384-32768]",sizeof("(16384-32768]")-1); + KafkaLog_Puts(kafka, "(16384-32768]"); else - KafkaLog_Write(kafka, ">32768",sizeof(">32768")-1); + KafkaLog_Puts(kafka, ">32768"); } case VLAN_PRIORITY: From 9bcd10b96f7786124e2c750f0356df8a9597f9fa Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Thu, 5 Dec 2013 13:38:01 +0000 Subject: [PATCH 085/198] FIX: ntohl were not applied in ip. --- src/output-plugins/spo_alert_json.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index c7669db..fad25a2 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -852,7 +852,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(jsonData->gi_org) { if(ip.family == AF_INET) - as_name = GeoIP_name_by_ipnum(jsonData->gi_org,ip.ip32[0]); + as_name = GeoIP_name_by_ipnum(jsonData->gi_org,ntohl(ip.ip32[0])); else as_name = GeoIP_name_by_ipnum_v6(jsonData->gi_org,ipv6); } @@ -1172,10 +1172,12 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(jsonData->gi){ const char * country_name = NULL; if(ip.family == AF_INET) - country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ip.ip32[0]); + country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ntohl(ip.ip32[0])); else country_name = GeoIP_country_name_by_ipnum_v6(jsonData->gi,ipv6); - KafkaLog_Puts(kafka,country_name?country_name:templateElement->defaultValue); + + if(country_name) + KafkaLog_Puts(kafka,country_name); } break; @@ -1184,10 +1186,12 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(jsonData->gi){ const char * country_name = NULL; if(ip.family == AF_INET) - country_name = GeoIP_country_code_by_ipnum(jsonData->gi,ip.ip32[0]); + country_name = GeoIP_country_code_by_ipnum(jsonData->gi,ntohl(ip.ip32[0])); else country_name = GeoIP_country_code_by_ipnum_v6(jsonData->gi,ipv6); - KafkaLog_Puts(kafka,country_name?country_name:templateElement->defaultValue); + + if(country_name) + KafkaLog_Puts(kafka,country_name); } break; From e823da94ff5dcc50bdeee4d2ee64e877a66fee08 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Wed, 18 Dec 2013 14:55:10 +0000 Subject: [PATCH 086/198] Solved a invalid write valgrind report. Don't sending ip,mac,vlans names by default. --- src/output-plugins/spo_alert_json.c | 59 ++++++++++++++++------------- src/rbutil/rb_kafka.c | 8 +--- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index fad25a2..3e76b80 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -84,13 +84,22 @@ #include "math.h" -// Not including: sensor_id_snort. -// @TODO find a more elegant way -#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,priority_name,classification,action,msg,payload,l4_proto,l4_proto_name,src,src_name,src_net,src_net_name,src_as,src_as_name,dst,dst_name,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_srcport_name,l4_dstport,l4_dstport_name,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_name,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" +// Send object_name or not. +// Note: Always including ,sensor_name,domain_name,group_name,src_net_name,src_as_name,dst_net_name,dst_as_name +//#define SEND_NAMES + +#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" + #ifdef HAVE_GEOIP -#define DEFAULT_JSON DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ +#define DEFAULT_JSON_1 DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ +#else +#define DEFAULT_JSON_1 DEFAULT_JSON_0 +#endif + +#ifdef SEND_NAMES +#define DEFAULT_JSON DEFAULT_JSON_1 ",l4_proto_name,src_name,dst_name,l4_srcport_name,l4_dstport_name,vlan_name" #else -#define DEFAULT_JSON DEFAULT_JSON_0 +#define DEFAULT_JSON DEFAULT_JSON_1 #endif #define DEFAULT_FILE "alert.json" @@ -780,7 +789,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type #endif /* Avoid repeated code */ - if(IPH_IS_VALID(p)){ + if(p && IPH_IS_VALID(p)){ switch(templateElement->id){ case SRC_TEMPLATE_ID: case SRC_STR: @@ -824,11 +833,12 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type #endif break; default: + sfip_clear(&ip); break; }; #ifdef HAVE_GEOIP - if(IPH_IS_VALID(p) && ip.family == AF_INET6){ + if(ip.family == AF_INET6){ switch(templateElement->id){ case SRC_COUNTRY: case SRC_COUNTRY_CODE: @@ -841,26 +851,23 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type }; } - if(IPH_IS_VALID(p)) + switch(templateElement->id) { - switch(templateElement->id) - { - case SRC_AS: - case SRC_AS_NAME: - case DST_AS: - case DST_AS_NAME: - if(jsonData->gi_org) - { - if(ip.family == AF_INET) - as_name = GeoIP_name_by_ipnum(jsonData->gi_org,ntohl(ip.ip32[0])); - else - as_name = GeoIP_name_by_ipnum_v6(jsonData->gi_org,ipv6); - } - break; - default: - break; - }; - } + case SRC_AS: + case SRC_AS_NAME: + case DST_AS: + case DST_AS_NAME: + if(jsonData->gi_org) + { + if(ip.family == AF_INET) + as_name = GeoIP_name_by_ipnum(jsonData->gi_org,ntohl(ip.ip32[0])); + else + as_name = GeoIP_name_by_ipnum_v6(jsonData->gi_org,ipv6); + } + break; + default: + break; + }; #endif } diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index bfc9373..fe266cd 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -57,12 +57,6 @@ #define unlikely(x) (x) #endif -/* some reasonable minimums */ -#define MIN_BUF (1*K_BYTES) -#define MIN_FILE (MIN_BUF) - -#define KAFKA_MESSAGES_QUEUE_MAXLEN (25*1024*1024) - #ifdef HAVE_LIBRDKAFKA @@ -70,6 +64,7 @@ * msg_delivered: just a debug function. See rdkafka library example *------------------------------------------------------------------- */ + /* static inline void msg_delivered (rd_kafka_t *rk, void *payload, size_t len, int error_code, @@ -81,6 +76,7 @@ static inline void msg_delivered (rd_kafka_t *rk, else fprintf(stderr,"%% Message delivered (%zd bytes)\n", len); } +*/ #endif From ab3c3dad71d07102eca7d04c20df5f651b69598d Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Thu, 26 Dec 2013 10:08:11 +0000 Subject: [PATCH 087/198] Added rb_macs_vendor support --- configure.in | 37 ++++++++++++++ src/output-plugins/spo_alert_json.c | 78 +++++++++++++++++++++++++++-- 2 files changed, 112 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 9631e47..eff9257 100644 --- a/configure.in +++ b/configure.in @@ -161,6 +161,43 @@ else AC_MSG_RESULT(no) fi +AC_ARG_WITH(macs-vendors-includes, + [ --with-macs-vendors-include=DIR librb_macs_vendors include directory], + [with_macsvendors_includes="$withval"],[with_macsvendors_includes="no"]) + +AC_ARG_WITH(macs-vendors-libraries, + [ --with-macs-vendors-libraries=DIR librb_macs_vendors library directory], + [with_macsvendors_libraries="$withval"],[with_macsvendors_libraries="no"]) + +if test "x$with_macsvendors_includes" != "xno"; then + CFLAGS="${CFLAGS} -I${with_macsvendors_includes}" +fi + +if test "x$with_macsvendors_libraries" != "xno"; then + LDFLAGS="${LDFLAGS} -L${with_macsvendors_libraries} -lrt -lz -lrd" +fi + +AC_ARG_ENABLE(rb-macs-vendors, +[ --enable-macs-vendors Enable geo-ip localization.], + enable_macs_vendors="$enableval", enable_macs_vendors="no") +if test "x$enable_macs_vendors" = "xyes"; then + AC_MSG_RESULT(yes) + AC_CHECK_HEADERS([rb_mac_vendors.h],[], + [ + echo "Error: librb_mac_vendors headers not found." + exit 1 + ]) + AC_CHECK_LIB(rb_mac_vendors,rb_new_mac_vendor_db,[], + [ + echo "Error: librb_mac_vendors library not found." + exit 1 + ]) + AC_DEFINE_UNQUOTED([HAVE_RB_MAC_VENDORS],[],[Have redborder mac vendors library]) + LDFLAGS="$LDFLAGS -lrb_mac_vendors" +else + AC_MSG_RESULT(no) +fi + AC_ARG_WITH(rdkafka_includes, [ --with-rdkafka-includes=DIR rdkafka include directory], [with_rdkafka_includes="$withval"],[with_rdkafka_includes="no"]) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 3e76b80..0e58624 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -73,6 +73,10 @@ #include "signal.h" #include "log_text.h" +#ifdef HAVE_RB_MAC_VENDORS +#include "rb_mac_vendors.h" +#endif + #ifdef HAVE_GEOIP #include "GeoIP.h" #endif // HAVE_GEOIP @@ -96,10 +100,16 @@ #define DEFAULT_JSON_1 DEFAULT_JSON_0 #endif +#ifdef HAVE_RB_MAC_VENDORS +#define DEFAULT_JSON_2 DEFAULT_JSON_1 ",ethsrc_vendor,ethdst_vendor" +#else +#define DEFAULT_JSON_2 DEFAULT_JSON_1 +#endif + #ifdef SEND_NAMES -#define DEFAULT_JSON DEFAULT_JSON_1 ",l4_proto_name,src_name,dst_name,l4_srcport_name,l4_dstport_name,vlan_name" +#define DEFAULT_JSON DEFAULT_JSON_2 ",l4_proto_name,src_name,dst_name,l4_srcport_name,l4_dstport_name,vlan_name" #else -#define DEFAULT_JSON DEFAULT_JSON_1 +#define DEFAULT_JSON DEFAULT_JSON_2 #endif #define DEFAULT_FILE "alert.json" @@ -141,6 +151,10 @@ typedef enum{ PROTO_ID, ETHSRC, ETHDST, +#ifdef HAVE_RB_MAC_VENDORS + ETHSRC_VENDOR, + ETHDST_VENDOR, +#endif ETHTYPE, VLAN, /* See vlan header */ VLAN_NAME, @@ -232,6 +246,9 @@ typedef struct _AlertJSONData #ifdef HAVE_GEOIP GeoIP *gi,*gi_org; #endif +#ifdef HAVE_RB_MAC_VENDORS + struct mac_vendor_database *eth_vendors_db; +#endif } AlertJSONData; /* Remember update printElementWithTemplate if some element modified here */ @@ -259,6 +276,10 @@ static AlertJSONTemplateElement template[] = { {PROTO_ID,"l4_proto","l4_proto",numericFormat,"0"}, {ETHSRC,"ethsrc","ethsrc",stringFormat,"-"}, {ETHDST,"ethdst","ethdst",stringFormat,"-"}, +#ifdef HAVE_RB_MAC_VENDORS + {ETHSRC_VENDOR,"ethsrc_vendor","ethsrc_vendor",stringFormat,"-"}, + {ETHDST_VENDOR,"ethdst_vendor","ethdst_vendor",stringFormat,"-"}, +#endif {ETHTYPE,"ethtype","ethtype",numericFormat,"0"}, {ARP_HW_SADDR,"arp_hw_saddr","arp_hw_saddr",stringFormat,"-"}, {ARP_HW_SPROT,"arp_hw_sprot","arp_hw_sprot",stringFormat,"-"}, @@ -400,6 +421,9 @@ static AlertJSONData *AlertJSONParseArgs(char *args) char * geoIP_path = NULL; char * geoIP_org_path = NULL; #endif + #ifdef HAVE_RB_MAC_VENDORS + char * eth_vendors_path = NULL; + #endif int start_partition=KAFKA_PARTITION,end_partition=KAFKA_PARTITION; DEBUG_WRAP(DebugMessage(DEBUG_INIT, "ParseJSONArgs: %s\n", args);); @@ -528,6 +552,12 @@ static AlertJSONData *AlertJSONParseArgs(char *args) RB_IF_CLEAN(geoIP_org_path,geoIP_org_path = SnortStrdup(tok+strlen("geoip_org=")),"%s(%i) param setted twice.\n",tok,i); } #endif // HAVE_GEOIP + #ifdef HAVE_RB_MAC_VENDORS + else if(!strncasecmp(tok,"eth_vendors=",strlen("eth_vendors="))) + { + RB_IF_CLEAN(eth_vendors_path,eth_vendors_path = SnortStrdup(tok+strlen("eth_vendors=")),"%s(%i) param setted twice.\n",tok,i); + } + #endif else { FatalError("alert_json: Cannot parse %s(%i): %s\n", @@ -593,9 +623,19 @@ static AlertJSONData *AlertJSONParseArgs(char *args) }else{ DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: No geoip organization database specified.\n");); } - #endif // HAVE_GEOIP +#ifdef HAVE_RB_MAC_VENDORS + if(eth_vendors_path) + { + data->eth_vendors_db = rb_new_mac_vendor_db(eth_vendors_path); + if(NULL==data->eth_vendors_db) + { + FatalError("alert_json: No valid rb_mac_vendors_database given.\n"); + } + } +#endif // HAVE_RB_MAC_VENDORS + DEBUG_WRAP(DebugMessage( DEBUG_INIT, "alert_json: '%s' '%s'\n", filename, data->jsonargs );); @@ -736,6 +776,20 @@ static inline void printHWaddr(KafkaLog *kafka,const uint8_t *addr,char * buf,co } } +/* convert a HW vector-form given into a uint64_t */ +static inline uint64_t HWADDR_vectoi(const uint8_t *vaddr) +{ + int i; + uint64_t addr = 0; + for(i=0;i<5;++i) + { + addr+=vaddr[i]; + addr<<=8; + } + addr+=vaddr[5]; + return addr; +} + static const char * actionOfEvent(void * voidevent,uint32_t event_type){ #define EVENT_IMPACT_FLAG(e) e->impact_flag #define EVENT_BLOCKED(e) e->blocked @@ -993,6 +1047,24 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type printHWaddr(kafka,p->eh->ether_dst,buf,bufLen); break; +#ifdef HAVE_RB_MAC_VENDORS + case ETHSRC_VENDOR: + if(p->eh && jsonData->eth_vendors_db) + { + const char * vendor = rb_find_mac_vendor(HWADDR_vectoi(p->eh->ether_src),jsonData->eth_vendors_db); + if(vendor) + KafkaLog_Puts(kafka,vendor); + } + case ETHDST_VENDOR: + if(p->eh && jsonData->eth_vendors_db) + { + const char * vendor = rb_find_mac_vendor(HWADDR_vectoi(p->eh->ether_dst),jsonData->eth_vendors_db); + if(vendor) + KafkaLog_Puts(kafka,vendor); + } + +#endif + case ARP_HW_SADDR: if(p->ah) printHWaddr(kafka,p->ah->arp_sha,buf,bufLen); From 50869489d7ba3c56e236b753e7bc15b700b47870 Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Thu, 26 Dec 2013 10:50:52 +0000 Subject: [PATCH 088/198] Cleaned old kafka code --- src/rbutil/rb_kafka.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/rbutil/rb_kafka.h b/src/rbutil/rb_kafka.h index b02b865..9004ca2 100644 --- a/src/rbutil/rb_kafka.h +++ b/src/rbutil/rb_kafka.h @@ -73,14 +73,7 @@ typedef struct _KafkaLog rd_kafka_t * handler; char* broker; char * topic; - #if RD_KAFKA_VERSION == 0x00080000 rd_kafka_topic_t *rkt; - #endif - #if RD_KAFKA_VERSION < 0x00080000 - int start_partition; - int end_partition; - int actual_partition; - #endif /* buffer attributes: */ From 4b33b2fe3fe82e94c82ccb41a7841c7491ceefbc Mon Sep 17 00:00:00 2001 From: Eugenio Perez Date: Wed, 15 Jan 2014 14:07:53 +0000 Subject: [PATCH 089/198] FIX: ETHDST_VENDOR without mac in switch. --- src/output-plugins/spo_alert_json.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 0e58624..e08a80c 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1055,6 +1055,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(vendor) KafkaLog_Puts(kafka,vendor); } + break; case ETHDST_VENDOR: if(p->eh && jsonData->eth_vendors_db) { @@ -1062,7 +1063,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(vendor) KafkaLog_Puts(kafka,vendor); } - + break; #endif case ARP_HW_SADDR: From 4fa91db98cbf56198d3374275fc436ed7c5eb765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Wed, 30 Apr 2014 19:20:31 +0000 Subject: [PATCH 090/198] FIX: spo_alert_json didn't compile if not HAVE_GEOIP present --- src/output-plugins/spo_alert_json.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index e08a80c..7ec6bd0 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1390,8 +1390,10 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; }; +#ifdef HAVE_GEOIP if(as_name) free(as_name); +#endif /* HAVE_GEOIP */ return KafkaLog_Tell(kafka)-initial_buffer_pos; /* if we have write something */ } From a56f46ca2f78f92acf67758e5cfc6bb084d2357d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Wed, 30 Apr 2014 20:05:15 +0000 Subject: [PATCH 091/198] FIX: rb_kafka didn't compile if not --enable-rdkafka present (thanks to Alberto for reporting) --- src/rbutil/rb_kafka.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index fe266cd..644538c 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -78,8 +78,6 @@ static inline void msg_delivered (rd_kafka_t *rk, } */ -#endif - /*------------------------------------------------------------------- * TextLog_Open/Close: open/close associated log file *------------------------------------------------------------------- @@ -125,6 +123,8 @@ static void KafkaLog_Close (rd_kafka_t* handle) rd_kafka_destroy(handle); } +#endif /* HAVE_LIBRDKAFKA */ + /*------------------------------------------------------------------- * KafkaLog_Init: constructor * If open=1, will create kafka handler. If not, KafkaLog->handler returned from this function From 56c8d63b16044655ed170a7d5d4890fb85ed5c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 26 May 2014 17:15:35 +0000 Subject: [PATCH 092/198] FIX: ethlen puts an extra 0 sometimes --- src/output-plugins/spo_alert_json.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 7ec6bd0..3742cbe 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1146,6 +1146,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type else KafkaLog_Puts(kafka, ">32768"); } + break; case VLAN_PRIORITY: if(p->vh) From f272e430f3b6bd9267f8e015372a207c581d1ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Tue, 27 May 2014 10:33:53 +0000 Subject: [PATCH 093/198] You can pass option to rdkafka directly (See #2250) --- src/output-plugins/spo_alert_json.c | 98 +++++++++++++++++++++++------ src/rbutil/rb_kafka.c | 12 ++-- src/rbutil/rb_kafka.h | 7 ++- 3 files changed, 91 insertions(+), 26 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 3742cbe..fa0cda2 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -119,7 +119,6 @@ #define KAFKA_PROT "kafka://" //#define KAFKA_TOPIC "rb_ips" -#define KAFKA_PARTITION 0 #define FILENAME_KAFKA_SEPARATOR '+' #define BROKER_TOPIC_SEPARATOR '@' @@ -395,6 +394,59 @@ static void AlertJSONInit(char *args) AddFuncToRestartList(AlertRestart, data); } +#ifdef HAVE_LIBRDKAFKA + +/* Extracted from Magnus Edenhill's kafkacat */ +static rd_kafka_conf_res_t +rdkafka_add_attr_to_config(rd_kafka_conf_t *rk_conf,rd_kafka_topic_conf_t *topic_conf, + const char *name,const char *val,char *errstr,size_t errstr_size){ + if (!strcmp(name, "list") || + !strcmp(name, "help")) { + rd_kafka_conf_properties_show(stdout); + exit(0); + } + + rd_kafka_conf_res_t res = RD_KAFKA_CONF_UNKNOWN; + /* Try "topic." prefixed properties on topic + * conf first, and then fall through to global if + * it didnt match a topic configuration property. */ + if (!strncmp(name, "topic.", strlen("topic."))) + res = rd_kafka_topic_conf_set(topic_conf, + name+strlen("topic."), + val,errstr,errstr_size); + + if (res == RD_KAFKA_CONF_UNKNOWN) + res = rd_kafka_conf_set(rk_conf, name, val, + errstr, errstr_size); + + return res; +} + +static rd_kafka_conf_res_t +rdkafka_add_str_to_config(rd_kafka_conf_t *rk_conf, rd_kafka_topic_conf_t *rkt_conf, + const char *_keyval, char *errstr,size_t errstr_size){ + + char *keyval = strdup(_keyval); + + const char *key = keyval; + char *val = strchr(keyval,'='); + + if(!val){ + FatalError("alert_json: Cannot parse %s(%i): %s: " + "rdkafka configuration does not have format rdkafka.key=value", + file_name, file_line, _keyval); + } + + *val = '\0'; + val++; + + const rd_kafka_conf_res_t rc = rdkafka_add_attr_to_config(rk_conf,rkt_conf,key,val,errstr,errstr_size); + free(keyval); + return rc; +} + +#endif + /* * Function: ParseJSONArgs(char *) * @@ -424,7 +476,10 @@ static AlertJSONData *AlertJSONParseArgs(char *args) #ifdef HAVE_RB_MAC_VENDORS char * eth_vendors_path = NULL; #endif - int start_partition=KAFKA_PARTITION,end_partition=KAFKA_PARTITION; + #ifdef HAVE_LIBRDKAFKA + rd_kafka_conf_t *rk_conf = rd_kafka_conf_new(); + rd_kafka_topic_conf_t *rkt_conf = rd_kafka_topic_conf_new(); + #endif DEBUG_WRAP(DebugMessage(DEBUG_INIT, "ParseJSONArgs: %s\n", args);); data = (AlertJSONData *)SnortAlloc(sizeof(AlertJSONData)); @@ -503,19 +558,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { RB_IF_CLEAN(vlansPath, vlansPath = SnortStrdup(tok+strlen("vlans=")),"%s(%i) param setted twice.\n",tok,i); } - else if(!strncasecmp(tok,"start_partition=",strlen("start_partition="))) - { - start_partition = end_partition = atol(tok+strlen("start_partition=")); - } #if 0 - else if(!strncasecmp(tok,"object_files=",strlen("object_files="))) - { - #ifdef HAVE_LIBRD - RB_IF_CLEAN(data->objects_path,data->objects_path = SnortStrdup(tok+strlen("objects_files=")),"%s(%i) param setted twice.\n",tok,i); - #else - FatalError("objects_files can only be setted if --enable-librd has been setted in configuration.\n") - #endif - } else if(!strncasecmp(tok,"ethlength_ranges=",strlen("ethlength_ranges="))) { unsigned num_intervals_limits,i=0; @@ -528,9 +571,23 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->eth_range_lengths[num_intervals_limits]=0; } #endif - else if(!strncasecmp(tok,"end_partition=",strlen("end_partition="))) + else if(!strncasecmp(tok,"rdkafka.",strlen("rdkafka."))){ + #if HAVE_LIBRDKAFKA + char errstr[512]; + + const rd_kafka_conf_res_t rc = rdkafka_add_str_to_config(rk_conf,rkt_conf,tok+strlen("rdkafka."),errstr,sizeof(errstr)); + if(rc != RD_KAFKA_CONF_OK){ + FatalError("alert_json: Cannot parse %s(%i): %s: %s\n", + file_name, file_line, tok,errstr); + } + #else + FatalError("alert_json: Cannot parse %s(%i): %s: Does not have librdkafka\n", + file_name, file_line, tok); + #endif + } + else if(!strncasecmp(tok,"eth_vendors=",strlen("eth_vendors="))) { - end_partition = atol(tok+strlen("end_partition=")); + RB_IF_CLEAN(eth_vendors_path,eth_vendors_path = SnortStrdup(tok+strlen("eth_vendors=")),"%s(%i) param setted twice.\n",tok,i); } else if(!strncasecmp(tok,"domain_name=",strlen("domain_name="))) { @@ -653,10 +710,11 @@ static AlertJSONData *AlertJSONParseArgs(char *args) * In DaemonMode(), kafka must start in another function, because, in daemon mode, Barnyard2Main will execute this * function, will do a fork() and then, in the child process, will call RealAlertJSON, that will not be able to * send kafka data*/ - - data->kafka = KafkaLog_Init(kafka_server,LOG_BUFFER, at_char+1, - start_partition,end_partition,BcDaemonMode()?0:1,filename==kafka_str?NULL:filename); - free(kafka_server); + data->kafka = KafkaLog_Init (kafka_server, LOG_BUFFER, at_char+1, kafka_str?NULL:filename + #ifdef HAVE_LIBRDKAFKA + ,rk_conf,rkt_conf + #endif + ); } if ( filename ) free(filename); if( kafka_str ) free (kafka_str); diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index 644538c..6262018 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -22,9 +22,9 @@ ****************************************************************************/ /** - * @file sf_kafka.c + * @file rb_kafka.c * @author Eugenio Perez - * based on the Russ Combs's sf_kafka.c + * based on the Russ Combs's sf_textlog.c * @date * * @brief implements buffered text stream for logging @@ -82,7 +82,7 @@ static inline void msg_delivered (rd_kafka_t *rk, * TextLog_Open/Close: open/close associated log file *------------------------------------------------------------------- */ -rd_kafka_t* KafkaLog_Open (const char* brokers) +static rd_kafka_t* KafkaLog_Open (const char* brokers) { char errstr[256]; rd_kafka_conf_t * conf = rd_kafka_conf_new(); @@ -135,8 +135,10 @@ static void KafkaLog_Close (rd_kafka_t* handle) *------------------------------------------------------------------- */ KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int bufLen, const char * topic, const int start_partition, - const int end_partition, bool open, const char*filename + const char* broker, unsigned int bufLen, const char * topic, const char*filename + #ifdef HAVE_LIBRDKAFKA + ,rd_kafka_conf_t *rk_conf,rd_kafka_topic_conf_t *rkt_conf + #endif ) { KafkaLog* this; diff --git a/src/rbutil/rb_kafka.h b/src/rbutil/rb_kafka.h index 9004ca2..81d62ff 100644 --- a/src/rbutil/rb_kafka.h +++ b/src/rbutil/rb_kafka.h @@ -76,6 +76,8 @@ typedef struct _KafkaLog rd_kafka_topic_t *rkt; + + /* buffer attributes: */ unsigned int pos; unsigned int bufLen; @@ -87,7 +89,10 @@ typedef struct _KafkaLog } KafkaLog; KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int bufLen, const char * topic, const int start_partition, const int end_partition, bool open, const char *filename + const char* broker, unsigned int bufLen, const char *topic, const char *filename + #ifdef HAVE_LIBRDKAFKA + ,rd_kafka_conf_t *rk_conf,rd_kafka_topic_conf_t *rkt_conf + #endif ); void KafkaLog_Term (KafkaLog* this); From ac571925e832534f5554db9a5b03c43070d8f073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Tue, 27 May 2014 11:42:28 +0000 Subject: [PATCH 094/198] Added delivery function callback for every message --- src/output-plugins/spo_alert_json.c | 4 +- src/rbutil/rb_kafka.c | 63 ++++++++++++++++------------- src/rbutil/rb_kafka.h | 4 +- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index fa0cda2..a969f3c 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1499,7 +1499,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO #ifdef HAVE_LIBRDKAFKA kafka->pos = initial_pos; // Revert the insertion of empty element */ #endif - if(kafka->textLog) kafka->textLog->pos = initial_pos; + + if(kafka->textLog) + kafka->textLog->pos = initial_pos; } } diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index 6262018..d455419 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -57,46 +57,54 @@ #define unlikely(x) (x) #endif +#define RB_UNUSED __attribute__((unused)) + #ifdef HAVE_LIBRDKAFKA /*------------------------------------------------------------------- - * msg_delivered: just a debug function. See rdkafka library example + * msg_delivered: callback function for every message. *------------------------------------------------------------------- */ - /* -static inline void msg_delivered (rd_kafka_t *rk, - void *payload, size_t len, + +static inline void msg_delivered (rd_kafka_t *rk RB_UNUSED, + void *payload RB_UNUSED, size_t len, int error_code, - void *opaque, void *msg_opaque) { + void *opaque RB_UNUSED, void *msg_opaque RB_UNUSED) { - if (error_code) - fprintf(stderr,"%% Message delivery failed: %s\n", - rd_kafka_err2str(error_code)); - else - fprintf(stderr,"%% Message delivered (%zd bytes)\n", len); + if (unlikely(error_code)) + ErrorMessage("rdkafka Message delivery failed: %s\n",rd_kafka_err2str(error_code)); + else if (unlikely(BcLogVerbose())) + LogMessage("rdkafka Message delivered (%zd bytes)\n", len); } -*/ /*------------------------------------------------------------------- * TextLog_Open/Close: open/close associated log file *------------------------------------------------------------------- */ -static rd_kafka_t* KafkaLog_Open (const char* brokers) +static void KafkaLog_Open (KafkaLog *this) { char errstr[256]; - rd_kafka_conf_t * conf = rd_kafka_conf_new(); - //conf.producer.dr_cb = msg_delivered; /* debug */ - rd_kafka_t * kafka_handle = rd_kafka_new(RD_KAFKA_PRODUCER, conf, errstr, sizeof(errstr)); - /*rd_kafka_set_log_level (kafka_handle, LOG_DEBUG);*/ - if(NULL==kafka_handle) - { - perror("kafka_new producer"); + if(!this->rk_conf) + FatalError("KafkaLog_Open called with NULL==this->rk_conf\n"); + + if(!this->rkt_conf) + FatalError("KafkaLog_Open called with NULL==this->rkt_conf\n"); + + rd_kafka_conf_set_dr_cb(this->rk_conf,msg_delivered); + this->handler = rd_kafka_new(RD_KAFKA_PRODUCER, this->rk_conf, errstr, sizeof(errstr)); + + if(NULL==this->handler) FatalError("Failed to create new producer: %s\n",errstr); - } - return kafka_handle; + if (rd_kafka_brokers_add(this->handler, this->broker) == 0) + FatalError("Kafka: No valid brokers specified in %s\n",this->broker); + + this->rkt = rd_kafka_topic_new(this->handler, this->topic, this->rkt_conf); + + if(NULL==this->rkt) + FatalError("It was not possible create a kafka topic %s\n",this->topic); } static void KafkaLog_Close (rd_kafka_t* handle) @@ -155,7 +163,10 @@ KafkaLog* KafkaLog_Init ( FatalError("Unable to allocate KafkaLog!\n"); } this->broker = broker ? SnortStrdup(broker) : NULL; - this->topic = topic ? SnortStrdup(topic) : NULL; + this->topic = topic ? SnortStrdup(topic) : NULL; + + this->rk_conf = rk_conf; + this->rkt_conf = rkt_conf; this->bufLen = this->start_bufLen = bufLen; #endif /* HAVE_LIBRDKAFKA */ @@ -200,15 +211,9 @@ bool KafkaLog_Flush(KafkaLog* this) // In daemon mode, we must start the handler here if(unlikely(this->handler==NULL && this->broker && this->topic)) { - this->handler = KafkaLog_Open(this->broker); + KafkaLog_Open(this); if(!this->handler) FatalError("It was not possible create a kafka handler\n",this->broker); - rd_kafka_topic_conf_t * topic_conf = rd_kafka_topic_conf_new(); - this->rkt = rd_kafka_topic_new(this->handler, this->topic, topic_conf); - if(NULL==this->rkt) - FatalError("It was not possible create a kafka topic %s\n",this->topic); - if (rd_kafka_brokers_add(this->handler, this->broker) == 0) - FatalError("Kafka: No valid brokers specified in %s\n",this->broker); } /* rd_kafka_dump(stdout,this->handler); */ diff --git a/src/rbutil/rb_kafka.h b/src/rbutil/rb_kafka.h index 81d62ff..c11572d 100644 --- a/src/rbutil/rb_kafka.h +++ b/src/rbutil/rb_kafka.h @@ -75,8 +75,8 @@ typedef struct _KafkaLog char * topic; rd_kafka_topic_t *rkt; - - + rd_kafka_conf_t *rk_conf; + rd_kafka_topic_conf_t *rkt_conf; /* buffer attributes: */ unsigned int pos; From 34376d132a85e4d852fdd19bb332b30ab7bd403a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 11 Jul 2014 09:06:44 +0000 Subject: [PATCH 095/198] Deleted priority name. Now priority is always a name --- src/output-plugins/spo_alert_json.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index a969f3c..7929c42 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -141,7 +141,6 @@ typedef enum{ SIG_ID, SIG_REV, PRIORITY, - PRIORITY_NAME, ACTION, CLASSIFICATION, MSG, @@ -240,8 +239,6 @@ typedef struct _AlertJSONData Number_str_assoc * hosts, *nets, *services, *protocols, *vlans; uint32_t sensor_id,domain_id,group_id; char * sensor_name, *sensor_type,*domain,*sensor_ip,*group_name; - #define MAX_PRIORITIES 16 - char * priority_name[MAX_PRIORITIES]; #ifdef HAVE_GEOIP GeoIP *gi,*gi_org; #endif @@ -250,6 +247,8 @@ typedef struct _AlertJSONData #endif } AlertJSONData; +static const char *priority_name[] = {NULL, "high", "medium", "low", "very low"}; + /* Remember update printElementWithTemplate if some element modified here */ static AlertJSONTemplateElement template[] = { {TIMESTAMP,"timestamp","timestamp",numericFormat,"0"}, @@ -266,8 +265,7 @@ static AlertJSONTemplateElement template[] = { {SIG_GENERATOR,"sig_generator","sig_generator",numericFormat,"0"}, {SIG_ID,"sig_id","sig_id",numericFormat,"0"}, {SIG_REV,"sig_rev","rev",numericFormat,"0"}, - {PRIORITY,"priority","priority",numericFormat,"0"}, - {PRIORITY_NAME,"priority_name","priority_name",stringFormat,"0"}, + {PRIORITY,"priority","priority",stringFormat,"unknown"}, {CLASSIFICATION,"classification","classification",stringFormat,"-"}, {MSG,"msg","msg",stringFormat,"-"}, {PAYLOAD,"payload","payload",stringFormat,"-"}, @@ -634,7 +632,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) if(servicesPath) FillHostsList(servicesPath,&data->services,SERVICES); if(protocolsPath) FillHostsList(protocolsPath,&data->protocols,PROTOCOLS); if(vlansPath) FillHostsList(vlansPath,&data->vlans,VLANS); - if(prioritiesPath) FillFixLengthList(prioritiesPath,data->priority_name,MAX_PRIORITIES); mSplitFree(&toks, num_toks); toks = mSplit(data->jsonargs, ",", 128, &num_toks, 0); @@ -755,7 +752,6 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) freeNumberStrAssocList(data->services); freeNumberStrAssocList(data->protocols); freeNumberStrAssocList(data->vlans); - freeFixLengthList(data->priority_name,MAX_PRIORITIES); for(iter=data->outputTemplate;iter;iter=aux){ aux = iter->next; free(iter); @@ -1033,18 +1029,13 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type if(event != NULL) KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->signature_revision),buf,bufLen)); break; - case PRIORITY_NAME: + case PRIORITY: { - const uint32_t prio = event?ntohl(((Unified2EventCommon *)event)->priority_id):MAX_PRIORITIES; - if( event && priopriority_name[prio]) - { - KafkaLog_Puts(kafka,jsonData->priority_name[prio]); - break; - } + const int priority_id = event ? ntohl(((Unified2EventCommon *)event)->priority_id) : 0; + const char *prio_name = priority_id < sizeof(priority_name) ? priority_name[priority_id] : NULL; + KafkaLog_Puts(kafka,prio_name ? prio_name : templateElement->defaultValue); + } - /* don't break*/; - case PRIORITY: - KafkaLog_Puts(kafka,event? itoa10(ntohl(((Unified2EventCommon *)event)->priority_id),buf,bufLen): templateElement->defaultValue); break; case CLASSIFICATION: if(event != NULL) From e3baa9ba46b19ee5ef8c11c1bb92a60d6a6d0cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 14 Jul 2014 07:33:08 +0000 Subject: [PATCH 096/198] FIX: Buffer overflow --- src/output-plugins/spo_alert_json.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 7929c42..63301cd 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1032,9 +1032,10 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case PRIORITY: { const int priority_id = event ? ntohl(((Unified2EventCommon *)event)->priority_id) : 0; - const char *prio_name = priority_id < sizeof(priority_name) ? priority_name[priority_id] : NULL; + const char *prio_name = NULL; + if(priority_id < sizeof(priority_name)/sizeof(priority_name[0])) + prio_name = priority_name; KafkaLog_Puts(kafka,prio_name ? prio_name : templateElement->defaultValue); - } break; case CLASSIFICATION: From 37a8067a63f27316b733c3fcb2606bf79a6f6d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 14 Jul 2014 07:39:26 +0000 Subject: [PATCH 097/198] FIX: Buffer overflow --- src/output-plugins/spo_alert_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 63301cd..facc080 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1034,7 +1034,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type const int priority_id = event ? ntohl(((Unified2EventCommon *)event)->priority_id) : 0; const char *prio_name = NULL; if(priority_id < sizeof(priority_name)/sizeof(priority_name[0])) - prio_name = priority_name; + prio_name = priority_name[priority_id]; KafkaLog_Puts(kafka,prio_name ? prio_name : templateElement->defaultValue); } break; From 3ab793eecf3dacd499ef2ac2e2a186553f85765e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Tue, 15 Jul 2014 07:59:53 +0000 Subject: [PATCH 098/198] FIX: priority was sent even when there was no event --- src/output-plugins/spo_alert_json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index facc080..9f9a090 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1030,8 +1030,8 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->signature_revision),buf,bufLen)); break; case PRIORITY: - { - const int priority_id = event ? ntohl(((Unified2EventCommon *)event)->priority_id) : 0; + if(event != NULL){ + const int priority_id = ntohl(((Unified2EventCommon *)event)->priority_id); const char *prio_name = NULL; if(priority_id < sizeof(priority_name)/sizeof(priority_name[0])) prio_name = priority_name[priority_id]; From d6536740e03f33d044bbb6168602a75c70ebd5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Wed, 16 Jul 2014 07:09:59 +0000 Subject: [PATCH 099/198] FIX: Bad delivery message callback management --- src/rbutil/rb_kafka.c | 51 +++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index d455419..0dcfb9e 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "rb_kafka.h" #include "log.h" @@ -113,7 +114,7 @@ static void KafkaLog_Close (rd_kafka_t* handle) /* Wait for messaging to finish. */ unsigned throw_msg_count = 10; - unsigned msg_left,prev_msg_left; + unsigned msg_left,prev_msg_left = 0; while((msg_left = rd_kafka_outq_len (handle) > 0) && throw_msg_count) { if(prev_msg_left == msg_left) /* Send no messages in a second? probably, the broker has fall down */ @@ -123,8 +124,7 @@ static void KafkaLog_Close (rd_kafka_t* handle) DEBUG_WRAP(DebugMessage(DEBUG_OUTPUT_PLUGIN, "[Thread %u] Waiting for messages to send. Still %u messages to be exported. %u retries left.\n");); prev_msg_left = msg_left; - sleep(1); - //rd_kafka_poll(); + rd_kafka_poll(handle,100); } /* Destroy the handle */ @@ -217,23 +217,36 @@ bool KafkaLog_Flush(KafkaLog* this) } /* rd_kafka_dump(stdout,this->handler); */ - - - if(unlikely(0 != rd_kafka_produce(this->rkt, RD_KAFKA_PARTITION_UA, - RD_KAFKA_MSG_F_FREE, - /* Payload and length */ - this->buf, this->pos, - /* Optional key and its length */ - NULL, 0, - /* Message opaque, provided in - * delivery report callback as - * msg_opaque. */ - NULL))) - { - free(this->buf); - } + int retried = 0; + do{ + const int produce_rc = rd_kafka_produce(this->rkt, RD_KAFKA_PARTITION_UA, + RD_KAFKA_MSG_F_FREE, + /* Payload and length */ + this->buf, this->pos, + /* Optional key and its length */ + NULL, 0, + /* Message opaque, provided in + * delivery report callback as + * msg_opaque. */ + NULL); + + if(likely(produce_rc) != -1){ + break; + }else{ + rd_kafka_resp_err_t err = rd_kafka_errno2err(errno); + if(err != RD_KAFKA_RESP_ERR__QUEUE_FULL || retried){ + ErrorMessage("Failed to produce message: %s",rd_kafka_err2str(err)); + free(this->buf); + this->buf = NULL; + break; + }else{ + // Queue full. Backpressure. + rd_kafka_poll(this->handler,5); + } + } + }while(1); /* Poll to handle delivery reports */ - //rd_kafka_poll(this->handler, 10); + rd_kafka_poll(this->handler, 0); this->buf = SnortAlloc(sizeof(char)*this->start_bufLen); this->bufLen = this->start_bufLen; From 25f5f6f06aebacbd8a17b019a8418371dc89e699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Thu, 17 Jul 2014 07:21:30 +0000 Subject: [PATCH 100/198] Barnyard cache is now freeing at the end, instead of start. This avoids a lot of lonely packet events --- src/spooler.c | 68 ++++++++++++++++++++------------------------------- src/spooler.h | 7 ++++-- 2 files changed, 31 insertions(+), 44 deletions(-) diff --git a/src/spooler.c b/src/spooler.c index d1b1052..753bec1 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -215,6 +215,8 @@ Spooler *spoolerOpen(const char *dirpath, const char *filename, uint32_t extensi FatalError("ERROR: No suitable input plugin found!\n"); } + TAILQ_INIT(&spooler->event_cache); + return spooler; } @@ -869,7 +871,7 @@ int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) { EventRecordNode *ernNode; - DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Caching event...\n");); + DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Caching event %lu\n",ntohl(((Unified2EventCommon *)data)->event_id));); /* allocate memory */ ernNode = (EventRecordNode *)SnortAlloc(sizeof(EventRecordNode)); @@ -880,9 +882,7 @@ int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) ernNode->data = data; /* add new events to the front of the cache */ - ernNode->next = spooler->event_cache; - - spooler->event_cache = ernNode; + TAILQ_INSERT_HEAD(&spooler->event_cache, ernNode, entry); spooler->events_cached++; DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Cached event: %d\n", spooler->events_cached);); @@ -892,16 +892,14 @@ int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) EventRecordNode *spoolerEventCacheGetByEventID(Spooler *spooler, uint32_t event_id) { - EventRecordNode *ernCurrent = spooler->event_cache; + EventRecordNode *ernCurrent = NULL; - while (ernCurrent != NULL) + TAILQ_FOREACH(ernCurrent, &spooler->event_cache, entry) { if ( ntohl(((Unified2EventCommon *)ernCurrent->data)->event_id) == event_id ) { return ernCurrent; } - - ernCurrent = ernCurrent->next; } return NULL; @@ -912,44 +910,41 @@ EventRecordNode *spoolerEventCacheGetHead(Spooler *spooler) if ( spooler == NULL ) return NULL; - return spooler->event_cache; + return TAILQ_FIRST(&spooler->event_cache); } uint8_t spoolerEventCacheHeadUsed(Spooler *spooler) { - if ( spooler == NULL || spooler->event_cache == NULL ) + if ( spooler == NULL || TAILQ_EMPTY(&spooler->event_cache) ) return 255; - return spooler->event_cache->used; + return spoolerEventCacheGetHead(spooler)->used; } +/* Extracted from Magnus Edenhill's librd */ +#ifndef TAILQ_FOREACH_SAFE +#define TAILQ_FOREACH_SAFE(elm,tmpelm,head,field) \ + for ((elm) = TAILQ_FIRST(head) ; \ + (elm) && ((tmpelm) = TAILQ_NEXT((elm), field), 1) ; \ + (elm) = (tmpelm)) +#endif + int spoolerEventCacheClean(Spooler *spooler) { EventRecordNode *ernCurrent = NULL; EventRecordNode *ernPrev = NULL; - EventRecordNode *ernNext = NULL; - if (spooler == NULL || spooler->event_cache == NULL ) + if (spooler == NULL || TAILQ_EMPTY(&spooler->event_cache) ) return 1; - ernPrev = spooler->event_cache; - ernCurrent = spooler->event_cache; - + ernCurrent = TAILQ_LAST(&spooler->event_cache,_EventRecordList); while (ernCurrent != NULL && spooler->events_cached > barnyard2_conf->event_cache_size ) { - ernNext = ernCurrent->next; - + ernPrev = TAILQ_PREV(ernCurrent, _EventRecordList, entry); if ( ernCurrent->used == 1 ) { /* Delete from list */ - if (ernCurrent == spooler->event_cache) - { - spooler->event_cache = ernNext; - } - else - { - ernPrev->next = ernNext; - } + TAILQ_REMOVE(&spooler->event_cache, ernCurrent, entry); spooler->events_cached--; @@ -964,12 +959,7 @@ int spoolerEventCacheClean(Spooler *spooler) } } - if(ernCurrent != NULL) - { - ernPrev = ernCurrent; - } - - ernCurrent = ernNext; + ernCurrent = ernPrev; } @@ -981,15 +971,13 @@ void spoolerEventCacheFlush(Spooler *spooler) EventRecordNode *next_ptr = NULL; EventRecordNode *evt_ptr = NULL; - if (spooler == NULL || spooler->event_cache == NULL ) + if (spooler == NULL || TAILQ_EMPTY(&spooler->event_cache)) return; - evt_ptr = spooler->event_cache; - - while(evt_ptr != NULL) + TAILQ_FOREACH_SAFE(evt_ptr,next_ptr,&spooler->event_cache,entry) { - next_ptr = evt_ptr->next; - + TAILQ_REMOVE(&spooler->event_cache,evt_ptr,entry); + if(evt_ptr->data) { free(evt_ptr->data); @@ -997,12 +985,8 @@ void spoolerEventCacheFlush(Spooler *spooler) } free(evt_ptr); - - evt_ptr = next_ptr; } - spooler->event_cache = NULL; - return; } diff --git a/src/spooler.h b/src/spooler.h index c629c00..b54eca2 100644 --- a/src/spooler.h +++ b/src/spooler.h @@ -28,6 +28,7 @@ #endif #include +#include #include "plugbase.h" @@ -73,9 +74,11 @@ typedef struct _EventRecordNode void *data; /* unified2 event (eg IPv4, IPV6, MPLS, etc) */ uint8_t used; /* has the event be retrieved */ - struct _EventRecordNode *next; /* reference to next event record */ + TAILQ_ENTRY(_EventRecordNode) entry; /* reference to next/prev event record */ } EventRecordNode; +typedef TAILQ_HEAD(_EventRecordList, _EventRecordNode) EventRecordCache; + typedef struct _PacketRecordNode { Packet *data; /* packet information */ @@ -99,7 +102,7 @@ typedef struct _Spooler Record record; // data of current Record - EventRecordNode *event_cache; // linked list of cached events + EventRecordCache event_cache; // linked list of cached events uint32_t events_cached; PacketRecordNode *packet_cache; // linked list of concurrent packets From 208ace426a841eb03de1575a8381d4e8815712fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Thu, 17 Jul 2014 07:33:43 +0000 Subject: [PATCH 101/198] Sanitized spooler.c: some functions made static, some prototypes deleted. --- src/spooler.c | 52 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/src/spooler.c b/src/spooler.c index 753bec1..b479af8 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -46,26 +46,22 @@ /* ** PRIVATE FUNCTIONS */ -Spooler *spoolerOpen(const char *, const char *, uint32_t); +static Spooler *spoolerOpen(const char *, const char *, uint32_t); int spoolerClose(Spooler *); -int spoolerReadRecordHeader(Spooler *); -int spoolerReadRecord(Spooler *); -void spoolerProcessRecord(Spooler *, int); -void spoolerFreeRecord(Record *record); +static int spoolerReadRecordHeader(Spooler *); +static int spoolerReadRecord(Spooler *); +static void spoolerProcessRecord(Spooler *, int); +static void spoolerFreeRecord(Record *record); -int spoolerWriteWaldo(Waldo *, Spooler *); -int spoolerOpenWaldo(Waldo *, uint8_t); +static int spoolerWriteWaldo(Waldo *, Spooler *); +static int spoolerOpenWaldo(Waldo *, uint8_t); int spoolerCloseWaldo(Waldo *); - -int spoolerPacketCacheAdd(Spooler *, Packet *); -int spoolerPacketCacheClear(Spooler *); - -int spoolerEventCachePush(Spooler *, uint32_t, void *); -EventRecordNode * spoolerEventCacheGetByEventID(Spooler *, uint32_t); -EventRecordNode * spoolerEventCacheGetHead(Spooler *); -uint8_t spoolerEventCacheHeadUsed(Spooler *); -int spoolerEventCacheClean(Spooler *); +static int spoolerEventCachePush(Spooler *, uint32_t, void *); +static EventRecordNode * spoolerEventCacheGetByEventID(Spooler *, uint32_t); +static EventRecordNode * spoolerEventCacheGetHead(Spooler *); +static uint8_t spoolerEventCacheHeadUsed(Spooler *); +static int spoolerEventCacheClean(Spooler *); /* Find the next spool file timestamp extension with a value equal to or * greater than timet. If extension != NULL, the extension will be @@ -150,7 +146,7 @@ static int FindNextExtension(const char *dirpath, const char *filebase, return SPOOLER_EXTENSION_FOUND; } -Spooler *spoolerOpen(const char *dirpath, const char *filename, uint32_t extension) +static Spooler *spoolerOpen(const char *dirpath, const char *filename, uint32_t extension) { Spooler *spooler = NULL; int ret; @@ -286,7 +282,7 @@ void UnRegisterSpooler(Spooler *spooler) -int spoolerReadRecordHeader(Spooler *spooler) +static int spoolerReadRecordHeader(Spooler *spooler) { int ret; @@ -319,7 +315,7 @@ int spoolerReadRecordHeader(Spooler *spooler) return 0; } -int spoolerReadRecord(Spooler *spooler) +static int spoolerReadRecord(Spooler *spooler) { int ret; @@ -687,7 +683,7 @@ int ProcessContinuousWithWaldo(Waldo *waldo) ** RECORD PROCESSING EVENTS */ -void spoolerProcessRecord(Spooler *spooler, int fire_output) +static void spoolerProcessRecord(Spooler *spooler, int fire_output) { struct pcap_pkthdr pkth; uint32_t type; @@ -867,7 +863,7 @@ void spoolerProcessRecord(Spooler *spooler, int fire_output) spoolerEventCacheClean(spooler); } -int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) +static int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) { EventRecordNode *ernNode; @@ -890,7 +886,7 @@ int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) return 0; } -EventRecordNode *spoolerEventCacheGetByEventID(Spooler *spooler, uint32_t event_id) +static EventRecordNode *spoolerEventCacheGetByEventID(Spooler *spooler, uint32_t event_id) { EventRecordNode *ernCurrent = NULL; @@ -905,7 +901,7 @@ EventRecordNode *spoolerEventCacheGetByEventID(Spooler *spooler, uint32_t event_ return NULL; } -EventRecordNode *spoolerEventCacheGetHead(Spooler *spooler) +static EventRecordNode *spoolerEventCacheGetHead(Spooler *spooler) { if ( spooler == NULL ) return NULL; @@ -913,7 +909,7 @@ EventRecordNode *spoolerEventCacheGetHead(Spooler *spooler) return TAILQ_FIRST(&spooler->event_cache); } -uint8_t spoolerEventCacheHeadUsed(Spooler *spooler) +static uint8_t spoolerEventCacheHeadUsed(Spooler *spooler) { if ( spooler == NULL || TAILQ_EMPTY(&spooler->event_cache) ) return 255; @@ -929,7 +925,7 @@ uint8_t spoolerEventCacheHeadUsed(Spooler *spooler) (elm) = (tmpelm)) #endif -int spoolerEventCacheClean(Spooler *spooler) +static int spoolerEventCacheClean(Spooler *spooler) { EventRecordNode *ernCurrent = NULL; EventRecordNode *ernPrev = NULL; @@ -991,7 +987,7 @@ void spoolerEventCacheFlush(Spooler *spooler) } -void spoolerFreeRecord(Record *record) +static void spoolerFreeRecord(Record *record) { if (record->data) { @@ -1012,7 +1008,7 @@ void spoolerFreeRecord(Record *record) ** Description: ** Open the waldo file, non-blocking, defined in the Waldo structure */ -int spoolerOpenWaldo(Waldo *waldo, uint8_t mode) +static int spoolerOpenWaldo(Waldo *waldo, uint8_t mode) { struct stat waldo_info; int waldo_file_flags = 0; @@ -1153,7 +1149,7 @@ int spoolerReadWaldo(Waldo *waldo) ** Write to the waldo file ** */ -int spoolerWriteWaldo(Waldo *waldo, Spooler *spooler) +static int spoolerWriteWaldo(Waldo *waldo, Spooler *spooler) { int ret; From a9de004e074d2f0d2f6531dcc75113cfad51252b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 18 Jul 2014 09:50:38 +0000 Subject: [PATCH 102/198] Enabled lonely events processing. SRC/DST IP are now extracted from event first. --- src/output-plugins/spo_alert_json.c | 309 ++++++++++++++++++---------- 1 file changed, 202 insertions(+), 107 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 9f9a090..530362b 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -844,7 +844,8 @@ static inline uint64_t HWADDR_vectoi(const uint8_t *vaddr) return addr; } -static const char * actionOfEvent(void * voidevent,uint32_t event_type){ +static const char * actionOfEvent(void * voidevent,uint32_t event_type) +{ #define EVENT_IMPACT_FLAG(e) e->impact_flag #define EVENT_BLOCKED(e) e->blocked #define ACTION_OF_EVENT(e) \ @@ -868,6 +869,100 @@ static const char * actionOfEvent(void * voidevent,uint32_t event_type){ return NULL; } +#define SRC_REQ 0 +#define DST_REQ 1 + +static int extract_ip_from_packet(sfip_t *ip,Packet *p,int srcdst_req) +{ + if(!(srcdst_req == SRC_REQ || srcdst_req == DST_REQ)) + { + ErrorMessage("extract_ip_from_packet called with no valid direction."); + return SFIP_FAILURE; + } + + #ifdef SUP_IP6 + + if(srcdst_req == SRC_REQ) + { + return SFIP_SUCCESS == sfip_set_ip(ip,GET_SRC_ADDR(p)); + } + else /* srcdst_req == DST_REQ)*/ + { + return SFIP_SUCCESS == sfip_set_ip(ip,GET_DST_ADDR(p)); + } + + #else + ipv4 = 0; + if(srcdst_req == SRC_REQ) + { + ipv4 = GET_SRC_ADDR(p).s_addr; + } + else + { + ipv4 = GET_DST_ADDR(p).s_addr + } + return sfip_set_raw(ip,&ipv4,AF_INET); + #endif +} + +static int extract_ip(sfip_t *ip,const void *_event, uint32_t event_type, Packet *p,int srcdst_req) +{ + if(!(srcdst_req == SRC_REQ || srcdst_req == DST_REQ)) + { + ErrorMessage("extract_ip_from_packet called with no valid direction."); + return SFIP_FAILURE; + } + + switch(event_type) + { + case UNIFIED2_PACKET: + // Does not have information in the event -> trying to get it from the packet + return extract_ip_from_packet(ip,p,srcdst_req); + + + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_VLAN: + // Share the same structure until src/dst ip included + { + uint32_t ipv4 = 0; + if(srcdst_req == SRC_REQ) + { + ipv4 = ((Unified2IDSEvent *)_event)->ip_source; + } + else + { + ipv4 = ((Unified2IDSEvent *)_event)->ip_destination; + } + + const int rc = sfip_set_raw(ip,&ipv4,AF_INET); + if(p && rc != SFIP_SUCCESS) + return extract_ip_from_packet(ip,p,srcdst_req); + return rc; + } + + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + // Share the same structure until src/dst ip included + { + int rc; + if(srcdst_req == SRC_REQ) + { + rc = sfip_set_raw(ip,((Unified2IDSEventIPv6 *)_event)->ip_source.s6_addr,AF_INET6); + } + else + { + rc = sfip_set_raw(ip,((Unified2IDSEventIPv6 *)_event)->ip_destination.s6_addr,AF_INET6); + } + if(p && rc != SFIP_SUCCESS) + return extract_ip_from_packet(ip,p,srcdst_req); + return rc; + } + default: + ErrorMessage("extract_ip called with an unknown event type."); + return SFIP_FAILURE; + } +} + /* * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) * @@ -881,7 +976,7 @@ static const char * actionOfEvent(void * voidevent,uint32_t event_type){ * Returns: 0 if nothing writed to jsonData. !=0 otherwise. * */ -static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement){ +static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement){ SigNode *sn; char tcpFlags[9]; /*char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"];*/ @@ -889,7 +984,9 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type const size_t bufLen = sizeof buf; const char * str_aux=NULL; KafkaLog * kafka = jsonData->kafka; + sfip_t ip; + sfip_clear(&ip); const int initial_buffer_pos = KafkaLog_Tell(jsonData->kafka); #ifdef HAVE_GEOIP geoipv6_t ipv6; @@ -897,94 +994,82 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type #endif /* Avoid repeated code */ - if(p && IPH_IS_VALID(p)){ - switch(templateElement->id){ - case SRC_TEMPLATE_ID: - case SRC_STR: - case SRC_NAME: - case SRC_NET: - case SRC_NET_NAME: + switch(templateElement->id){ + case SRC_TEMPLATE_ID: + case SRC_STR: + case SRC_NAME: + case SRC_NET: + case SRC_NET_NAME: #ifdef HAVE_GEOIP - case SRC_COUNTRY: - case SRC_COUNTRY_CODE: - case SRC_AS: - case SRC_AS_NAME: + case SRC_COUNTRY: + case SRC_COUNTRY_CODE: + case SRC_AS: + case SRC_AS_NAME: #endif -#ifdef SUP_IP6 - sfip_set_ip(&ip,GET_SRC_ADDR(p)); -#else - { - int ipv4 = GET_SRC_ADDR(p).s_addr; - sfip_set_raw(&ip,&ipv4,AF_INET); - } + extract_ip(&ip,event,event_type,p,SRC_REQ); + break; + + case DST_TEMPLATE_ID: + case DST_STR: + case DST_NAME: + case DST_NET: + case DST_NET_NAME: +#ifdef HAVE_GEOIP + case DST_COUNTRY: + case DST_COUNTRY_CODE: + case DST_AS: + case DST_AS_NAME: #endif - break; + extract_ip(&ip,event,event_type,p,DST_REQ); + break; + + case SRCPORT: + case SRCPORT_NAME: + + + default: + break; + }; - case DST_TEMPLATE_ID: - case DST_STR: - case DST_NAME: - case DST_NET: - case DST_NET_NAME: #ifdef HAVE_GEOIP + if(ip.family == AF_INET6){ + switch(templateElement->id){ + case SRC_COUNTRY: + case SRC_COUNTRY_CODE: case DST_COUNTRY: case DST_COUNTRY_CODE: - case DST_AS: - case DST_AS_NAME: -#endif -#ifdef SUP_IP6 - sfip_set_ip(&ip,GET_DST_ADDR(p)); -#else - { - int ipv4 = GET_DST_ADDR(p).s_addr; - sfip_set_raw(&ip,&ipv4,AF_INET); - } -#endif + memcpy(ipv6.s6_addr, ip.ip8, sizeof(ipv6.s6_addr)); break; default: - sfip_clear(&ip); break; }; + } -#ifdef HAVE_GEOIP - if(ip.family == AF_INET6){ - switch(templateElement->id){ - case SRC_COUNTRY: - case SRC_COUNTRY_CODE: - case DST_COUNTRY: - case DST_COUNTRY_CODE: - memcpy(ipv6.s6_addr, ip.ip8, sizeof(ipv6.s6_addr)); - break; - default: - break; - }; - } - - switch(templateElement->id) - { - case SRC_AS: - case SRC_AS_NAME: - case DST_AS: - case DST_AS_NAME: - if(jsonData->gi_org) - { - if(ip.family == AF_INET) - as_name = GeoIP_name_by_ipnum(jsonData->gi_org,ntohl(ip.ip32[0])); - else - as_name = GeoIP_name_by_ipnum_v6(jsonData->gi_org,ipv6); - } - break; - default: - break; - }; + switch(templateElement->id) + { + case SRC_AS: + case SRC_AS_NAME: + case DST_AS: + case DST_AS_NAME: + if(jsonData->gi_org) + { + if(ip.family == AF_INET) + as_name = GeoIP_name_by_ipnum(jsonData->gi_org,ntohl(ip.ip32[0])); + else + as_name = GeoIP_name_by_ipnum_v6(jsonData->gi_org,ipv6); + } + break; + default: + break; + }; #endif - } #ifdef DEBUG if(NULL==templateElement) FatalError("TemplateElement was not setted (File %s line %d)\n.",__FILE__,__LINE__); #endif switch(templateElement->id){ case TIMESTAMP: - KafkaLog_Puts(kafka,itoa10(p->pkth->ts.tv_sec, buf, bufLen)); + KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->event_second), buf, bufLen)); break; case SENSOR_ID_SNORT: KafkaLog_Puts(kafka,event?itoa10(ntohl(((Unified2EventCommon *)event)->sensor_id),buf, bufLen):templateElement->defaultValue); @@ -1075,7 +1160,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; case PROTO: - if(IPH_IS_VALID(p)){ + if(p && IPH_IS_VALID(p)){ Number_str_assoc * service_name_asoc = SearchNumberStr(GET_IPH_PROTO(p),jsonData->protocols); if(service_name_asoc){ KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); @@ -1084,22 +1169,26 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type } /* don't break! */ case PROTO_ID: - KafkaLog_Puts(kafka,itoa10(IPH_IS_VALID(p)?GET_IPH_PROTO(p):0,buf,bufLen)); + if(p && IPH_IS_VALID(p)) + { + KafkaLog_Puts(kafka,itoa10(GET_IPH_PROTO(p),buf,bufLen)); + } + break; case ETHSRC: - if(p->eh) + if(p && p->eh) printHWaddr(kafka, p->eh->ether_src, buf,bufLen); break; case ETHDST: - if(p->eh) + if(p && p->eh) printHWaddr(kafka,p->eh->ether_dst,buf,bufLen); break; #ifdef HAVE_RB_MAC_VENDORS case ETHSRC_VENDOR: - if(p->eh && jsonData->eth_vendors_db) + if(p && p->eh && jsonData->eth_vendors_db) { const char * vendor = rb_find_mac_vendor(HWADDR_vectoi(p->eh->ether_src),jsonData->eth_vendors_db); if(vendor) @@ -1107,7 +1196,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type } break; case ETHDST_VENDOR: - if(p->eh && jsonData->eth_vendors_db) + if(p && p->eh && jsonData->eth_vendors_db) { const char * vendor = rb_find_mac_vendor(HWADDR_vectoi(p->eh->ether_dst),jsonData->eth_vendors_db); if(vendor) @@ -1117,11 +1206,11 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type #endif case ARP_HW_SADDR: - if(p->ah) + if(p && p->ah) printHWaddr(kafka,p->ah->arp_sha,buf,bufLen); break; case ARP_HW_SPROT: - if(p->ah) + if(p && p->ah) { KafkaLog_Puts(kafka, "0x"); KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[0],buf,bufLen)); @@ -1131,11 +1220,11 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type } break; case ARP_HW_TADDR: - if(p->ah) + if(p && p->ah) printHWaddr(kafka,p->ah->arp_tha,buf,bufLen); break; case ARP_HW_TPROT: - if(p->ah) + if(p && p->ah) { KafkaLog_Puts(kafka, "0x"); KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[0],buf,bufLen)); @@ -1146,25 +1235,25 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; case ETHTYPE: - if(p->eh) + if(p && p->eh) { KafkaLog_Puts(kafka, itoa10(ntohs(p->eh->ether_type),buf,bufLen)); } break; case UDPLENGTH: - if(p->udph){ + if(p && p->udph){ KafkaLog_Puts(kafka, itoa10(ntohs(p->udph->uh_len),buf,bufLen)); } break; case ETHLENGTH: - if(p->eh){ + if(p && p->eh){ KafkaLog_Puts(kafka, itoa10(p->pkth->len,buf,bufLen)); } break; case ETHLENGTH_RANGE: - if(p->eh){ + if(p && p->eh){ if(p->pkth->len==0) KafkaLog_Puts(kafka, "0"); if(p->pkth->len<=64) @@ -1199,19 +1288,19 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; case VLAN_PRIORITY: - if(p->vh) + if(p && p->vh) KafkaLog_Puts(kafka,itoa10(VTH_PRIORITY(p->vh),buf,bufLen)); break; case VLAN_DROP: - if(p->vh) + if(p && p->vh) KafkaLog_Puts(kafka,itoa10(VTH_CFI(p->vh),buf,bufLen)); break; case VLAN: - if(p->vh) + if(p && p->vh) KafkaLog_Puts(kafka,itoa10(VTH_VLAN(p->vh),buf,bufLen)); break; case VLAN_NAME: - if(p->vh){ + if(p && p->vh){ Number_str_assoc * service_name_asoc = SearchNumberStr(VTH_VLAN(p->vh),jsonData->vlans); if(service_name_asoc) KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); @@ -1222,7 +1311,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type case SRCPORT_NAME: case DSTPORT_NAME: - if(IPH_IS_VALID(p)) + if(p && IPH_IS_VALID(p)) { switch(GET_IPH_PROTO(p)) { @@ -1242,7 +1331,7 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type break; case SRCPORT: case DSTPORT: - if(IPH_IS_VALID(p)) + if(p && IPH_IS_VALID(p)) { switch(GET_IPH_PROTO(p)) { @@ -1349,19 +1438,19 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type #endif /* HAVE_GEOIP */ case ICMPTYPE: - if(p->icmph) + if(p && p->icmph) KafkaLog_Puts(kafka, itoa10(p->icmph->type,buf,bufLen)); break; case ICMPCODE: - if(p->icmph) + if(p && p->icmph) KafkaLog_Puts(kafka, itoa10(p->icmph->code,buf,bufLen)); break; case ICMPID: - if(p->icmph) + if(p && p->icmph) KafkaLog_Puts(kafka, itoa10(ntohs(p->icmph->s_icmp_id),buf,bufLen)); break; case ICMPSEQ: - if(p->icmph){ + if(p && p->icmph){ /* Doesn't work because "%d" arbitrary PrintJSONFieldName(kafka,JSON_ICMPSEQ_NAME); KafkaLog_Print(kafka, "%d",ntohs(p->icmph->s_icmp_seq)); @@ -1370,24 +1459,24 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type } break; case TTL: - if(IPH_IS_VALID(p)) + if(p && IPH_IS_VALID(p)) KafkaLog_Puts(kafka,itoa10(GET_IPH_TTL(p),buf,bufLen)); break; case TOS: - if(IPH_IS_VALID(p)) + if(p && IPH_IS_VALID(p)) KafkaLog_Puts(kafka,itoa10(GET_IPH_TOS(p),buf,bufLen)); break; case ID: - if(IPH_IS_VALID(p)) + if(p && IPH_IS_VALID(p)) KafkaLog_Puts(kafka,itoa10(IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p)),buf,bufLen)); break; case IPLEN: - if(IPH_IS_VALID(p)) + if(p && IPH_IS_VALID(p)) KafkaLog_Puts(kafka,itoa10(GET_IPH_LEN(p) << 2,buf,bufLen)); break; case IPLEN_RANGE: - if(IPH_IS_VALID(p)) + if(p && IPH_IS_VALID(p)) { const double log2_len = log2(GET_IPH_LEN(p) << 2); const unsigned int lower_limit = pow(2.0,floor(log2_len)); @@ -1399,37 +1488,37 @@ static int printElementWithTemplate(Packet * p, void *event, uint32_t event_type } break; case DGMLEN: - if(IPH_IS_VALID(p)){ + if(p && IPH_IS_VALID(p)){ // XXX might cause a bug when IPv6 is printed? KafkaLog_Puts(kafka, itoa10(ntohs(GET_IPH_LEN(p)),buf,bufLen)); } break; case TCPSEQ: - if(p->tcph){ + if(p && p->tcph){ // KafkaLog_Print(kafka, "lX%0x",(u_long) ntohl(p->tcph->th_ack)); // hex format KafkaLog_Puts(kafka,itoa10(ntohl(p->tcph->th_seq),buf,bufLen)); } break; case TCPACK: - if(p->tcph){ + if(p && p->tcph){ // KafkaLog_Print(kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); KafkaLog_Puts(kafka,itoa10(ntohl(p->tcph->th_ack),buf,bufLen)); } break; case TCPLEN: - if(p->tcph){ + if(p && p->tcph){ KafkaLog_Puts(kafka, itoa10(TCP_OFFSET(p->tcph) << 2,buf,bufLen)); } break; case TCPWINDOW: - if(p->tcph){ + if(p && p->tcph){ //KafkaLog_Print(kafka, "0x%X",ntohs(p->tcph->th_win)); // hex format KafkaLog_Puts(kafka,itoa10(ntohs(p->tcph->th_win),buf,bufLen)); } break; case TCPFLAGS: - if(p->tcph) + if(p && p->tcph) { CreateTCPFlagString(p, tcpFlags); KafkaLog_Puts(kafka, tcpFlags); @@ -1467,8 +1556,14 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO KafkaLog * kafka = jsonData->kafka; - if(p == NULL) + // if(p == NULL) + // return; + + if(event == NULL) + { + ErrorMessage("Lonely packet detected. Please consider increase the cache size."); return; + } DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging JSON Alert data\n");); KafkaLog_Putc(kafka,'{'); From 7158760642bdc2733143b5684595cfba61753781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 18 Jul 2014 11:00:29 +0000 Subject: [PATCH 103/198] Trying to get proto from event before attempt to extract from the packet. --- src/output-plugins/spo_alert_json.c | 38 +++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 530362b..00f6672 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -958,8 +958,29 @@ static int extract_ip(sfip_t *ip,const void *_event, uint32_t event_type, Packet return rc; } default: - ErrorMessage("extract_ip called with an unknown event type."); - return SFIP_FAILURE; + return extract_ip_from_packet(ip,p,srcdst_req); + } +} + +static uint8_t extract_proto(const void *_event, uint32_t event_type, Packet *p) +{ + switch(event_type) + { + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_VLAN: + // Share the same structure until protocol ip included + return ((Unified2IDSEvent *)_event)->protocol; + + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + return ((Unified2IDSEventIPv6 *)_event)->protocol; + + default: // Try to extract from the packet + if(p && IPH_IS_VALID(p)) + { + return GET_IPH_PROTO(p); + } + return 0; } } @@ -1160,18 +1181,19 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, break; case PROTO: - if(p && IPH_IS_VALID(p)){ - Number_str_assoc * service_name_asoc = SearchNumberStr(GET_IPH_PROTO(p),jsonData->protocols); + { + const uint16_t proto = extract_proto(event,event_type,p); + Number_str_assoc * service_name_asoc = SearchNumberStr(proto,jsonData->protocols); if(service_name_asoc){ KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); break; - } // Else: print PROTO_ID + } } - /* don't break! */ + /* don't break! Print, at least, proto_id*/ case PROTO_ID: - if(p && IPH_IS_VALID(p)) { - KafkaLog_Puts(kafka,itoa10(GET_IPH_PROTO(p),buf,bufLen)); + const uint16_t proto = extract_proto(event,event_type,p); + KafkaLog_Puts(kafka,itoa10(proto,buf,bufLen)); } break; From 64f9cfde65945e0669cd018e7228a194d6f6e53b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 21 Jul 2014 06:41:53 +0000 Subject: [PATCH 104/198] src and dst port now extracted from the event instead of the packet. If cannot extract from event, then try to extract from packet. --- src/output-plugins/spo_alert_json.c | 97 +++++++++++++++++++++-------- 1 file changed, 70 insertions(+), 27 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 00f6672..e85dc66 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -984,6 +984,58 @@ static uint8_t extract_proto(const void *_event, uint32_t event_type, Packet *p) } } +static uint8_t extract_port_from_packet(Packet *p,int srcdst_req) +{ + return ntohs(srcdst_req == SRC_REQ ? p->sp : p->dp); +} + +static uint8_t extract_port(const void *_event, uint32_t event_type, Packet *p,int srcdst_req) +{ + if(!(srcdst_req == SRC_REQ || srcdst_req == DST_REQ)) + { + ErrorMessage("extract_port called with no valid direction."); + return 0; + } + + const uint8_t proto = extract_proto(_event,event_type,p); + if(!(proto == IPPROTO_TCP || proto == IPPROTO_UDP)) + { + return 0; + } + + switch(event_type) + { + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_VLAN: + // Share the same structure until ports included + if(srcdst_req == SRC_REQ) + { + return ntohs(((Unified2IDSEvent *)_event)->sport_itype); + } + else + { + return ntohs(((Unified2IDSEvent *)_event)->dport_icode); + } + + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + // Share the same structure until ports included + if(srcdst_req == SRC_REQ) + { + return ntohs(((Unified2IDSEventIPv6 *)_event)->sport_itype); + } + else + { + return ntohs(((Unified2IDSEventIPv6 *)_event)->dport_icode); + } + + default: // Try to extract from the packet + if(p && IPH_IS_VALID(p)) + return extract_port_from_packet(p,srcdst_req); + return 0; + } +} + /* * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) * @@ -1333,40 +1385,31 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case SRCPORT_NAME: case DSTPORT_NAME: - if(p && IPH_IS_VALID(p)) { - switch(GET_IPH_PROTO(p)) + const uint16_t port = templateElement->id==SRCPORT_NAME? + extract_port(event, event_type, p,SRC_REQ) + :extract_port(event, event_type, p,DST_REQ); + Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services); + + if(port!=0) { - case IPPROTO_UDP: - case IPPROTO_TCP: - { - const uint16_t port = templateElement->id==SRCPORT_NAME? p->sp:p->dp; - Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services); - if(service_name_asoc) - KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); - else /* Log port number */ - KafkaLog_Puts(kafka,itoa10(templateElement->id==SRCPORT_NAME? p->sp:p->dp,buf,bufLen)); - } - break; - }; + if(service_name_asoc) + KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); + else /* Log port number */ + KafkaLog_Puts(kafka,itoa10(port,buf,bufLen)); + } } break; + case SRCPORT: case DSTPORT: - if(p && IPH_IS_VALID(p)) { - switch(GET_IPH_PROTO(p)) - { - case IPPROTO_UDP: - case IPPROTO_TCP: - KafkaLog_Puts(kafka,itoa10(templateElement->id==SRCPORT? p->sp:p->dp,buf,bufLen)); - break; - default: /* Always log something */ - KafkaLog_Puts(kafka,templateElement->defaultValue); - break; - } - }else{ /* Always Log something */ - KafkaLog_Puts(kafka,templateElement->defaultValue); + const uint16_t port = templateElement->id==SRCPORT? + extract_port(event, event_type, p,SRC_REQ) + :extract_port(event, event_type, p,DST_REQ); + + if(port!=0) + KafkaLog_Puts(kafka,itoa10(port,buf,bufLen)); } break; From 0f49c6214a8c272f6cfa50b8eeb2a9d7cfb62081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 21 Jul 2014 06:59:09 +0000 Subject: [PATCH 105/198] ICMP type now tried to extracted from event first than the packet --- src/output-plugins/spo_alert_json.c | 34 +++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index e85dc66..f0d7e4f 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1036,6 +1036,33 @@ static uint8_t extract_port(const void *_event, uint32_t event_type, Packet *p,i } } +static uint16_t extract_icmp_type(const void *_event, uint32_t event_type, Packet *p) +{ + const uint8_t proto = extract_proto(_event,event_type,p); + if(!(proto == IPPROTO_ICMP)) + { + return 0; + } + + switch(event_type) + { + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_VLAN: + // Share the same structure until ports included + return ntohs(((Unified2IDSEvent *)_event)->sport_itype); + + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + // Share the same structure until ports included + return ntohs(((Unified2IDSEventIPv6 *)_event)->sport_itype); + + default: // Try to extract from the packet + if(p && IPH_IS_VALID(p) && p->icmph) + return p->icmph->type; + return 0; + } +} + /* * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) * @@ -1503,8 +1530,11 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, #endif /* HAVE_GEOIP */ case ICMPTYPE: - if(p && p->icmph) - KafkaLog_Puts(kafka, itoa10(p->icmph->type,buf,bufLen)); + { + const uint16_t itype = extract_icmp_type(event,event_type,p); + if(itype) + KafkaLog_Puts(kafka, itoa10(itype,buf,bufLen)); + } break; case ICMPCODE: if(p && p->icmph) From 99fb1266c36a995efd839eda337628cacb5ad5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 21 Jul 2014 07:13:05 +0000 Subject: [PATCH 106/198] extract icmp code first from event that from packet. ICMP code & type only printed if icmp protocolot event --- src/output-plugins/spo_alert_json.c | 50 ++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index f0d7e4f..3d4d44f 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1036,14 +1036,18 @@ static uint8_t extract_port(const void *_event, uint32_t event_type, Packet *p,i } } -static uint16_t extract_icmp_type(const void *_event, uint32_t event_type, Packet *p) +static uint16_t extract_icmp_type(const void *_event, uint32_t event_type, Packet *p, int *okp) { const uint8_t proto = extract_proto(_event,event_type,p); if(!(proto == IPPROTO_ICMP)) { + if(okp) + *okp = 0; return 0; } + if(okp) + *okp = 1; switch(event_type) { case UNIFIED2_IDS_EVENT: @@ -1063,6 +1067,37 @@ static uint16_t extract_icmp_type(const void *_event, uint32_t event_type, Packe } } +static uint16_t extract_icmp_code(const void *_event, uint32_t event_type, Packet *p, int *okp) +{ + const uint8_t proto = extract_proto(_event,event_type,p); + if(!(proto == IPPROTO_ICMP)) + { + if(okp) + *okp = 0; + return 0; + } + + if(okp) + *okp = 1; + switch(event_type) + { + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_VLAN: + // Share the same structure until ports included + return ntohs(((Unified2IDSEvent *)_event)->dport_icode); + + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + // Share the same structure until ports included + return ntohs(((Unified2IDSEventIPv6 *)_event)->dport_icode); + + default: // Try to extract from the packet + if(p && IPH_IS_VALID(p) && p->icmph) + return p->icmph->code; + return 0; + } +} + /* * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) * @@ -1531,14 +1566,19 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case ICMPTYPE: { - const uint16_t itype = extract_icmp_type(event,event_type,p); - if(itype) + int ok; + const uint16_t itype = extract_icmp_type(event,event_type,p,&ok); + if(ok) KafkaLog_Puts(kafka, itoa10(itype,buf,bufLen)); } break; case ICMPCODE: - if(p && p->icmph) - KafkaLog_Puts(kafka, itoa10(p->icmph->code,buf,bufLen)); + { + int ok; + const uint16_t icode = extract_icmp_code(event,event_type,p,&ok); + if(ok) + KafkaLog_Puts(kafka, itoa10(icode,buf,bufLen)); + } break; case ICMPID: if(p && p->icmph) From f00d29d4d9668b859984094e2ae3230a2cd63ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 21 Jul 2014 08:22:09 +0000 Subject: [PATCH 107/198] Trying to extract vlanId information of the event first of the packet. --- src/output-plugins/spo_alert_json.c | 55 ++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 3d4d44f..cd0d6a6 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1098,6 +1098,36 @@ static uint16_t extract_icmp_code(const void *_event, uint32_t event_type, Packe } } +static uint16_t extract_vlan_id(const void *_event, uint32_t event_type, Packet *p, int *okp) +{ + switch(event_type) + { + case UNIFIED2_IDS_EVENT_VLAN: + // Share the same structure until ports included + if(okp) + *okp = 1; + return ntohs(((Unified2IDSEvent *)_event)->vlanId); + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + // Share the same structure until ports included + if(okp) + *okp = 1; + return ntohs(((Unified2IDSEventIPv6 *)_event)->vlanId); + + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_IPV6: + default: // Try to extract from the packet + if(p && IPH_IS_VALID(p) && p->vh) + { + if(okp) + *okp = 1; + return VTH_VLAN(p->vh); + } + if(okp) + okp = 0; + return 0; + } +} + /* * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) * @@ -1432,16 +1462,25 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, KafkaLog_Puts(kafka,itoa10(VTH_CFI(p->vh),buf,bufLen)); break; case VLAN: - if(p && p->vh) - KafkaLog_Puts(kafka,itoa10(VTH_VLAN(p->vh),buf,bufLen)); + { + int ok; + const uint16_t vlan = extract_vlan_id(event, event_type, p, &ok); + if(ok) + KafkaLog_Puts(kafka,itoa10(vlan,buf,bufLen)); + } break; case VLAN_NAME: - if(p && p->vh){ - Number_str_assoc * service_name_asoc = SearchNumberStr(VTH_VLAN(p->vh),jsonData->vlans); - if(service_name_asoc) - KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); - else - KafkaLog_Puts(kafka,itoa10(VTH_VLAN(p->vh),buf,bufLen)); + { + int ok; + const uint16_t vlan = extract_vlan_id(event, event_type, p, &ok); + if(ok) + { + const Number_str_assoc * vlan_str = SearchNumberStr(vlan,jsonData->vlans); + if(vlan_str) + KafkaLog_Puts(kafka,vlan_str->human_readable_str); + else + KafkaLog_Puts(kafka,itoa10(vlan,buf,bufLen)); + } } break; From e103aac26df377c9e5273c43ba12ff4822a28d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 21 Jul 2014 09:59:10 +0000 Subject: [PATCH 108/198] ipv6 country database loaded separately from ipv4 country database --- src/output-plugins/spo_alert_json.c | 145 +++++++++++++++++----------- 1 file changed, 89 insertions(+), 56 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index cd0d6a6..950223f 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -241,7 +241,10 @@ typedef struct _AlertJSONData char * sensor_name, *sensor_type,*domain,*sensor_ip,*group_name; #ifdef HAVE_GEOIP GeoIP *gi,*gi_org; -#endif +#ifdef SUP_IP6 + GeoIP *gi6,*gi6_org; +#endif /* SUP_IP6 */ +#endif /* HAVE_GEOIP */ #ifdef HAVE_RB_MAC_VENDORS struct mac_vendor_database *eth_vendors_db; #endif @@ -470,7 +473,11 @@ static AlertJSONData *AlertJSONParseArgs(char *args) #ifdef HAVE_GEOIP char * geoIP_path = NULL; char * geoIP_org_path = NULL; - #endif + #ifdef SUP_IP6 + char * geoIP6_path = NULL; + char * geoIP6_org_path = NULL; + #endif /* SUP_IP6 */ + #endif /* HAVE_GEOIP */ #ifdef HAVE_RB_MAC_VENDORS char * eth_vendors_path = NULL; #endif @@ -556,19 +563,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { RB_IF_CLEAN(vlansPath, vlansPath = SnortStrdup(tok+strlen("vlans=")),"%s(%i) param setted twice.\n",tok,i); } - #if 0 - else if(!strncasecmp(tok,"ethlength_ranges=",strlen("ethlength_ranges="))) - { - unsigned num_intervals_limits,i=0; - char ** limits = mSplit((char *)tok+strlen("ethlength_ranges"), ",", 0, &num_intervals_limits, '\\'); - data->eth_range_lengths = SnortAlloc(num_intervals_limits+1); - for(i=0;ieth_range_lengths[i]=atoi(limits); - } - data->eth_range_lengths[num_intervals_limits]=0; - } - #endif else if(!strncasecmp(tok,"rdkafka.",strlen("rdkafka."))){ #if HAVE_LIBRDKAFKA char errstr[512]; @@ -591,12 +585,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { RB_IF_CLEAN(data->domain, data->domain = SnortStrdup(tok+strlen("domain_name=")),"%s(%i) param setted twice.\n",tok,i); } - #if 0 - else if(!strncasecmp(tok,"domain_id=",strlen("domain_id="))) - { - data->domain_id = atol(tok+strlen("domain_id=")); - } - #endif #ifdef HAVE_GEOIP else if(!strncasecmp(tok,"geoip=",strlen("geoip="))) { @@ -606,7 +594,17 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { RB_IF_CLEAN(geoIP_org_path,geoIP_org_path = SnortStrdup(tok+strlen("geoip_org=")),"%s(%i) param setted twice.\n",tok,i); } - #endif // HAVE_GEOIP + #ifdef SUP_IP6 + else if(!strncasecmp(tok,"geoip6=",strlen("geoip6="))) + { + RB_IF_CLEAN(geoIP6_path,geoIP6_path = SnortStrdup(tok+strlen("geoip6=")),"%s(%i) param setted twice.\n",tok,i); + } + else if(!strncasecmp(tok,"geoip6_org=",strlen("geoip6_org="))) + { + RB_IF_CLEAN(geoIP6_org_path,geoIP6_org_path = SnortStrdup(tok+strlen("geoip6_org=")),"%s(%i) param setted twice.\n",tok,i); + } + #endif /* SUP_IP6 */ + #endif /* HAVE_GEOIP */ #ifdef HAVE_RB_MAC_VENDORS else if(!strncasecmp(tok,"eth_vendors=",strlen("eth_vendors="))) { @@ -677,6 +675,20 @@ static AlertJSONData *AlertJSONParseArgs(char *args) }else{ DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: No geoip organization database specified.\n");); } + +#ifdef SUP_IP6 + if(geoIP6_path){ + data->gi6 = GeoIP_open(geoIP6_path, GEOIP_MEMORY_CACHE); + + if (data->gi6 == NULL) + ErrorMessage("alert_json: Error opening database %s\n",geoIP6_path); + else + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: Success opening geoip database: %s\n", geoIP6_path);); + }else{ + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: No geoip database specified.\n");); + } +#endif + #endif // HAVE_GEOIP #ifdef HAVE_RB_MAC_VENDORS @@ -1128,6 +1140,53 @@ static uint16_t extract_vlan_id(const void *_event, uint32_t event_type, Packet } } +#ifdef HAVE_GEOIP +#define RETURN_COUNTRY_CODE 0 +#define RETURN_COUNTRY_LONG 1 +static const char *extract_country0(AlertJSONData *jsonData,const sfip_t *ip, int format) +{ + const char *country_name = NULL; + + if(NULL == ip) + { + ErrorMessage("extract_country called with ip==NULL"); + return NULL; + } + + if(!(format == RETURN_COUNTRY_CODE || format == RETURN_COUNTRY_LONG)) + { + ErrorMessage("extract_country called with unknown format"); + return NULL; + } + + if(sfip_family(ip) == AF_INET && jsonData->gi) + { + if(format == RETURN_COUNTRY_CODE) + country_name = GeoIP_country_code_by_ipnum(jsonData->gi,ntohl(ip->ip32[0])); + else + country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ntohl(ip->ip32[0])); + } +#ifdef SUP_IP6 + else if(sfip_family(ip) == AF_INET6 && jsonData->gi6) + { + geoipv6_t ipv6; + memcpy(ipv6.s6_addr, ip->ip8, sizeof(ipv6.s6_addr)); + if(format == RETURN_COUNTRY_CODE) + country_name = GeoIP_country_code_by_ipnum_v6(jsonData->gi6,ipv6); + else + country_name = GeoIP_country_name_by_ipnum_v6(jsonData->gi6,ipv6); + } +#endif + + return country_name; +} + +#define extract_country(jsonData,ip) extract_country0(jsonData,ip,RETURN_COUNTRY_LONG) +#define extract_country_code(jsonData,ip) extract_country0(jsonData,ip,RETURN_COUNTRY_CODE) + +#endif + + /* * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) * @@ -1144,7 +1203,6 @@ static uint16_t extract_vlan_id(const void *_event, uint32_t event_type, Packet static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement){ SigNode *sn; char tcpFlags[9]; - /*char buf[sizeof "ff:ff:ff:ff:ff:ff:255.255.255.255"];*/ char buf[sizeof "0000:0000:0000:0000:0000:0000:0000:0000"]; const size_t bufLen = sizeof buf; const char * str_aux=NULL; @@ -1154,8 +1212,8 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, sfip_clear(&ip); const int initial_buffer_pos = KafkaLog_Tell(jsonData->kafka); #ifdef HAVE_GEOIP - geoipv6_t ipv6; char * as_name=NULL; + geoipv6_t ipv6; #endif /* Avoid repeated code */ @@ -1188,28 +1246,11 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, extract_ip(&ip,event,event_type,p,DST_REQ); break; - case SRCPORT: - case SRCPORT_NAME: - - default: break; }; #ifdef HAVE_GEOIP - if(ip.family == AF_INET6){ - switch(templateElement->id){ - case SRC_COUNTRY: - case SRC_COUNTRY_CODE: - case DST_COUNTRY: - case DST_COUNTRY_CODE: - memcpy(ipv6.s6_addr, ip.ip8, sizeof(ipv6.s6_addr)); - break; - default: - break; - }; - } - switch(templateElement->id) { case SRC_AS: @@ -1220,8 +1261,10 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, { if(ip.family == AF_INET) as_name = GeoIP_name_by_ipnum(jsonData->gi_org,ntohl(ip.ip32[0])); + #ifdef SUP_IP6 else as_name = GeoIP_name_by_ipnum_v6(jsonData->gi_org,ipv6); + #endif } break; default: @@ -1555,13 +1598,8 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, #ifdef HAVE_GEOIP case SRC_COUNTRY: case DST_COUNTRY: - if(jsonData->gi){ - const char * country_name = NULL; - if(ip.family == AF_INET) - country_name = GeoIP_country_name_by_ipnum(jsonData->gi,ntohl(ip.ip32[0])); - else - country_name = GeoIP_country_name_by_ipnum_v6(jsonData->gi,ipv6); - + { + const char * country_name = extract_country(jsonData,&ip); if(country_name) KafkaLog_Puts(kafka,country_name); } @@ -1570,14 +1608,9 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case SRC_COUNTRY_CODE: case DST_COUNTRY_CODE: if(jsonData->gi){ - const char * country_name = NULL; - if(ip.family == AF_INET) - country_name = GeoIP_country_code_by_ipnum(jsonData->gi,ntohl(ip.ip32[0])); - else - country_name = GeoIP_country_code_by_ipnum_v6(jsonData->gi,ipv6); - - if(country_name) - KafkaLog_Puts(kafka,country_name); + const char * country_code = extract_country_code(jsonData,&ip); + if(country_code) + KafkaLog_Puts(kafka,country_code); } break; From b0103b15e5346a4fa5f9d465cc3a6b0f6033a834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 21 Jul 2014 11:40:07 +0000 Subject: [PATCH 109/198] Autonomous System Numbers ipv6 database are now sepparated from ipv4 ones --- src/output-plugins/spo_alert_json.c | 93 +++++++++++++++++------------ 1 file changed, 54 insertions(+), 39 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 950223f..90a43ef 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -687,6 +687,18 @@ static AlertJSONData *AlertJSONParseArgs(char *args) }else{ DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: No geoip database specified.\n");); } + + if(geoIP6_org_path) + { + data->gi6_org = GeoIP_open(geoIP6_org_path, GEOIP_MEMORY_CACHE); + + if (data->gi6_org == NULL) + ErrorMessage("alert_json: Error opening database %s\n",geoIP6_org_path); + else + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: Success opening geoip database: %s\n", geoIP6_org_path);); + }else{ + DEBUG_WRAP(DebugMessage(DEBUG_INIT, "alert_json: No geoip organization database specified.\n");); + } #endif #endif // HAVE_GEOIP @@ -1184,6 +1196,32 @@ static const char *extract_country0(AlertJSONData *jsonData,const sfip_t *ip, in #define extract_country(jsonData,ip) extract_country0(jsonData,ip,RETURN_COUNTRY_LONG) #define extract_country_code(jsonData,ip) extract_country0(jsonData,ip,RETURN_COUNTRY_CODE) +static char *extract_AS(AlertJSONData *jsonData,const sfip_t *ip) +{ + char *as = NULL; + + if(NULL == ip) + { + ErrorMessage("extract_AS called with ip==NULL"); + return NULL; + } + + if(sfip_family(ip) == AF_INET && jsonData->gi_org) + { + as = GeoIP_name_by_ipnum(jsonData->gi_org,ntohl(ip->ip32[0])); + } +#ifdef SUP_IP6 + else if(sfip_family(ip) == AF_INET6 && jsonData->gi6_org) + { + geoipv6_t ipv6; + memcpy(ipv6.s6_addr, ip->ip8, sizeof(ipv6.s6_addr)); + as = GeoIP_name_by_ipnum_v6(jsonData->gi6_org,ipv6); + } +#endif + + return as; +} + #endif @@ -1211,10 +1249,6 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, sfip_t ip; sfip_clear(&ip); const int initial_buffer_pos = KafkaLog_Tell(jsonData->kafka); -#ifdef HAVE_GEOIP - char * as_name=NULL; - geoipv6_t ipv6; -#endif /* Avoid repeated code */ switch(templateElement->id){ @@ -1250,28 +1284,6 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, break; }; -#ifdef HAVE_GEOIP - switch(templateElement->id) - { - case SRC_AS: - case SRC_AS_NAME: - case DST_AS: - case DST_AS_NAME: - if(jsonData->gi_org) - { - if(ip.family == AF_INET) - as_name = GeoIP_name_by_ipnum(jsonData->gi_org,ntohl(ip.ip32[0])); - #ifdef SUP_IP6 - else - as_name = GeoIP_name_by_ipnum_v6(jsonData->gi_org,ipv6); - #endif - } - break; - default: - break; - }; -#endif - #ifdef DEBUG if(NULL==templateElement) FatalError("TemplateElement was not setted (File %s line %d)\n.",__FILE__,__LINE__); #endif @@ -1616,21 +1628,29 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case SRC_AS: case DST_AS: - if(as_name) { - const char * space = strchr(as_name,' '); - if(space) - KafkaLog_Write(kafka,as_name+2,space - &as_name[2]); + char *as_name = extract_AS(jsonData,&ip); + if(as_name) + { + const char *space = strchr(as_name,' '); + if(space) + KafkaLog_Write(kafka,as_name+2,space - &as_name[2]); + free(as_name); + } } break; case SRC_AS_NAME: case DST_AS_NAME: - if(as_name) { - const char * space = strchr(as_name,' '); - if(space) - KafkaLog_Puts(kafka,space+1); + char *as_name = extract_AS(jsonData,&ip); + if(as_name) + { + const char * space = strchr(as_name,' '); + if(space) + KafkaLog_Puts(kafka,space+1); + free(as_name); + } } break; @@ -1737,11 +1757,6 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, break; }; -#ifdef HAVE_GEOIP - if(as_name) - free(as_name); -#endif /* HAVE_GEOIP */ - return KafkaLog_Tell(kafka)-initial_buffer_pos; /* if we have write something */ } From c3c02f071290cc026c11d75a92d0e041faf7fae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 21 Jul 2014 11:56:21 +0000 Subject: [PATCH 110/198] Cosmetic changes: SRC_REQ and DST_REQ uses are now encapsulated by macros --- src/output-plugins/spo_alert_json.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 90a43ef..eafd31e 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -929,7 +929,7 @@ static int extract_ip_from_packet(sfip_t *ip,Packet *p,int srcdst_req) #endif } -static int extract_ip(sfip_t *ip,const void *_event, uint32_t event_type, Packet *p,int srcdst_req) +static int extract_ip0(sfip_t *ip,const void *_event, uint32_t event_type, Packet *p,int srcdst_req) { if(!(srcdst_req == SRC_REQ || srcdst_req == DST_REQ)) { @@ -986,6 +986,11 @@ static int extract_ip(sfip_t *ip,const void *_event, uint32_t event_type, Packet } } +#define extract_src_ip(ip,event,event_type,p) \ + extract_ip0(ip,event, event_type, p,SRC_REQ) +#define extract_dst_ip(ip,event,event_type,p) \ + extract_ip0(ip,event, event_type, p,DST_REQ) + static uint8_t extract_proto(const void *_event, uint32_t event_type, Packet *p) { switch(event_type) @@ -1013,7 +1018,7 @@ static uint8_t extract_port_from_packet(Packet *p,int srcdst_req) return ntohs(srcdst_req == SRC_REQ ? p->sp : p->dp); } -static uint8_t extract_port(const void *_event, uint32_t event_type, Packet *p,int srcdst_req) +static uint8_t extract_port0(const void *_event, uint32_t event_type, Packet *p,int srcdst_req) { if(!(srcdst_req == SRC_REQ || srcdst_req == DST_REQ)) { @@ -1060,6 +1065,11 @@ static uint8_t extract_port(const void *_event, uint32_t event_type, Packet *p,i } } +#define extract_src_port(event,event_type,packet) \ + extract_port0(event,event_type,packet,SRC_REQ) +#define extract_dst_port(event,event_type,packet) \ + extract_port0(event,event_type,packet,DST_REQ) + static uint16_t extract_icmp_type(const void *_event, uint32_t event_type, Packet *p, int *okp) { const uint8_t proto = extract_proto(_event,event_type,p); @@ -1263,7 +1273,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case SRC_AS: case SRC_AS_NAME: #endif - extract_ip(&ip,event,event_type,p,SRC_REQ); + extract_src_ip(&ip,event,event_type,p); break; case DST_TEMPLATE_ID: @@ -1277,7 +1287,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case DST_AS: case DST_AS_NAME: #endif - extract_ip(&ip,event,event_type,p,DST_REQ); + extract_dst_ip(&ip,event,event_type,p); break; default: @@ -1543,8 +1553,8 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case DSTPORT_NAME: { const uint16_t port = templateElement->id==SRCPORT_NAME? - extract_port(event, event_type, p,SRC_REQ) - :extract_port(event, event_type, p,DST_REQ); + extract_src_port(event, event_type, p) + :extract_dst_port(event, event_type, p); Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services); if(port!=0) @@ -1561,8 +1571,8 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case DSTPORT: { const uint16_t port = templateElement->id==SRCPORT? - extract_port(event, event_type, p,SRC_REQ) - :extract_port(event, event_type, p,DST_REQ); + extract_src_port(event, event_type, p) + :extract_dst_port(event, event_type, p); if(port!=0) KafkaLog_Puts(kafka,itoa10(port,buf,bufLen)); From 03555b0a7dc2a7997106926234460fcfdb64aa22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 21 Jul 2014 12:00:08 +0000 Subject: [PATCH 111/198] FIX: didn't compile if --enable-ipv6 was not present --- src/output-plugins/spo_alert_json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index eafd31e..6bcd32d 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -916,14 +916,14 @@ static int extract_ip_from_packet(sfip_t *ip,Packet *p,int srcdst_req) } #else - ipv4 = 0; + uint32_t ipv4 = 0; if(srcdst_req == SRC_REQ) { ipv4 = GET_SRC_ADDR(p).s_addr; } else { - ipv4 = GET_DST_ADDR(p).s_addr + ipv4 = GET_DST_ADDR(p).s_addr; } return sfip_set_raw(ip,&ipv4,AF_INET); #endif From 760101139d3818918358234ccf3fffdf76252322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Thu, 28 Aug 2014 06:52:57 +0000 Subject: [PATCH 112/198] rb_pointers added copyright --- src/rbutil/rb_pointers.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/rbutil/rb_pointers.h b/src/rbutil/rb_pointers.h index 154d4df..b63d52d 100644 --- a/src/rbutil/rb_pointers.h +++ b/src/rbutil/rb_pointers.h @@ -1,3 +1,32 @@ +/**************************************************************************** + * + * Copyright (C) 2013 Eneo Tecnologia S.L. + * Author: Eugenio Perez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License Version 2 as + * published by the Free Software Foundation. You may not use, modify or + * distribute this program under any other version of the GNU General + * Public License. + * + * 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. + * + ****************************************************************************/ + +/** + * @file rb_pointers.h + * @author Eugenio Pérez + * @date Wed May 29 2013 + * + * @brief Declares a few utilities to work with pointers. + */ #ifndef RB_POINTERS #define RB_POINTERS From 6d2eb219720bbf7c59b706c0bb48b36914abbf3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Thu, 28 Aug 2014 07:28:55 +0000 Subject: [PATCH 113/198] Extracted actionOfEvent function, in order to reuse in another output plugin --- src/output-plugins/spo_alert_json.c | 26 +--------- src/rbutil/Makefile.am | 2 +- src/rbutil/rb_unified2.c | 76 +++++++++++++++++++++++++++++ src/rbutil/rb_unified2.h | 33 +++++++++++++ 4 files changed, 111 insertions(+), 26 deletions(-) create mode 100644 src/rbutil/rb_unified2.c create mode 100644 src/rbutil/rb_unified2.h diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 6bcd32d..5f29aa1 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -69,6 +69,7 @@ #include "rbutil/rb_kafka.h" #include "rbutil/rb_numstrpair_list.h" #include "rbutil/rb_pointers.h" +#include "rbutil/rb_unified2.h" #include "errno.h" #include "signal.h" #include "log_text.h" @@ -868,31 +869,6 @@ static inline uint64_t HWADDR_vectoi(const uint8_t *vaddr) return addr; } -static const char * actionOfEvent(void * voidevent,uint32_t event_type) -{ - #define EVENT_IMPACT_FLAG(e) e->impact_flag - #define EVENT_BLOCKED(e) e->blocked - #define ACTION_OF_EVENT(e) \ - if(EVENT_IMPACT_FLAG(event)==0 && EVENT_BLOCKED(event)==0) return "alert";\ - if(EVENT_IMPACT_FLAG(event)==32 && EVENT_BLOCKED(event)==1) return "drop";\ - if(event==NULL && event_type ==0) return "log" - - switch(event_type){ - case 7: - { - Unified2IDSEvent_legacy *event = (Unified2IDSEvent_legacy *)voidevent; - ACTION_OF_EVENT(e); - } - case 104: - { - Unified2IDSEvent *event = (Unified2IDSEvent *)voidevent; - ACTION_OF_EVENT(e); - } - /* IPV6 pending */ - }; - return NULL; -} - #define SRC_REQ 0 #define DST_REQ 1 diff --git a/src/rbutil/Makefile.am b/src/rbutil/Makefile.am index 1b51e82..186308d 100644 --- a/src/rbutil/Makefile.am +++ b/src/rbutil/Makefile.am @@ -2,6 +2,6 @@ AUTOMAKE_OPTIONS=foreign no-dependencies noinst_LIBRARIES = librbutil.a -librbutil_a_SOURCES = rb_kafka.c rb_kafka.h rb_numstrpair_list.h rb_numstrpair_list.c +librbutil_a_SOURCES = rb_kafka.c rb_kafka.h rb_numstrpair_list.h rb_numstrpair_list.c rb_unified2.c INCLUDES = -I.. -I../sfutil diff --git a/src/rbutil/rb_unified2.c b/src/rbutil/rb_unified2.c new file mode 100644 index 0000000..64a5685 --- /dev/null +++ b/src/rbutil/rb_unified2.c @@ -0,0 +1,76 @@ +/**************************************************************************** + * + * Copyright (C) 2014 Eneo Tecnologia S.L. + * Author: Eugenio Perez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License Version 2 as + * published by the Free Software Foundation. You may not use, modify or + * distribute this program under any other version of the GNU General + * Public License. + * + * 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. + * + ****************************************************************************/ + +/** + * @file rb_unified2.c + * @author Eugenio Pérez + * @date Wed May 29 2013 + * + * @brief Defines redBorder utilities to work with unified2 events + */ + + +#include "rb_unified2.h" +#include + +#include "unified2.h" +#include + + +#define EVENT_IMPACT_FLAG(e) e->impact_flag +#define EVENT_BLOCKED(e) e->blocked + +/// @warning It's a macro, and it will return the caller function +#define RETURN_ACTION_OF_EVENT(event) \ + do{ \ + if(EVENT_IMPACT_FLAG(event)==0 && EVENT_BLOCKED(event)==0) return "alert";\ + if(EVENT_IMPACT_FLAG(event)==32 && EVENT_BLOCKED(event)==1) return "drop";\ + if(event==NULL && event_type ==0) return "log";\ + }while(0) + +const char *actionOfEvent(const void * voidevent,uint32_t event_type) +{ + switch(event_type){ + case UNIFIED2_IDS_EVENT: + { + const Unified2IDSEvent_legacy *event = (const Unified2IDSEvent_legacy *)voidevent; + RETURN_ACTION_OF_EVENT(event); + } + case UNIFIED2_IDS_EVENT_VLAN: + { + const Unified2IDSEvent *event = (const Unified2IDSEvent *)voidevent; + RETURN_ACTION_OF_EVENT(event); + } + case UNIFIED2_IDS_EVENT_IPV6: + { + const Unified2IDSEventIPv6_legacy *event = (const Unified2IDSEventIPv6_legacy *)voidevent; + RETURN_ACTION_OF_EVENT(event); + + } + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + { + const Unified2IDSEventIPv6 *event = (const Unified2IDSEventIPv6 *)voidevent; + RETURN_ACTION_OF_EVENT(event); + } + }; + return NULL; +} diff --git a/src/rbutil/rb_unified2.h b/src/rbutil/rb_unified2.h new file mode 100644 index 0000000..a125b05 --- /dev/null +++ b/src/rbutil/rb_unified2.h @@ -0,0 +1,33 @@ +/**************************************************************************** + * + * Copyright (C) 2014 Eneo Tecnologia S.L. + * Author: Eugenio Perez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License Version 2 as + * published by the Free Software Foundation. You may not use, modify or + * distribute this program under any other version of the GNU General + * Public License. + * + * 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. + * + ****************************************************************************/ + +/** + * @file rb_unified2.h + * @author Eugenio Pérez + * @date Wed May 29 2013 + * + * @brief Declares redBorder utilities to work with unified2 events + */ + +#include + +const char * actionOfEvent(const void * event,uint32_t event_type); From 5fa044b3585dae6aaa90730d22e8140439818e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Thu, 28 Aug 2014 07:29:08 +0000 Subject: [PATCH 114/198] Syslog output plugin can print the action taken --- src/output-plugins/spo_alert_syslog.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/output-plugins/spo_alert_syslog.c b/src/output-plugins/spo_alert_syslog.c index a6d72de..2ddab40 100644 --- a/src/output-plugins/spo_alert_syslog.c +++ b/src/output-plugins/spo_alert_syslog.c @@ -70,6 +70,8 @@ #include "util.h" #include "ipv6_port.h" +#include "rb_unified2.h" + typedef struct _SyslogData { @@ -504,6 +506,7 @@ void AlertSyslog(Packet *p, void *event, uint32_t event_type, void *arg) char pri_data[STD_BUF]; char ip_data[STD_BUF]; char event_data[STD_BUF]; + char action_data[STD_BUF]; #define SYSLOG_BUF 1024 char event_string[SYSLOG_BUF]; SyslogData *data; @@ -585,6 +588,21 @@ void AlertSyslog(Packet *p, void *event, uint32_t event_type, void *arg) return; } + if(event) + { + const char *action_taken = actionOfEvent(event,event_type); + if(action_taken) + { + const int snprintf_rc = SnortSnprintf(action_data, STD_BUF, "[Action: %s]:", + action_taken ? action_taken : "Unknown"); + if( snprintf_rc != SNORT_SNPRINTF_SUCCESS ) + return; + const int strlcat_rc = strlcat(event_string, action_taken, SYSLOG_BUF); + if( strlcat_rc >= SYSLOG_BUF ) + return; + } + } + if((GET_IPH_PROTO(p) != IPPROTO_TCP && GET_IPH_PROTO(p) != IPPROTO_UDP) || p->frag_flag) From 9f5c7ad8fdd5bf0ee16c579ec7c1dcb350cd86d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 29 Aug 2014 05:58:14 +0000 Subject: [PATCH 115/198] Syslog output plugin now prints action taken too. --- src/output-plugins/spo_syslog_full.c | 50 ++++++++++++++++++++++++---- src/output-plugins/spo_syslog_full.h | 1 + src/rbutil/rb_unified2.h | 2 +- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/output-plugins/spo_syslog_full.c b/src/output-plugins/spo_syslog_full.c index be004c4..5793d39 100644 --- a/src/output-plugins/spo_syslog_full.c +++ b/src/output-plugins/spo_syslog_full.c @@ -50,7 +50,9 @@ */ #include "output-plugins/spo_syslog_full.h" +#undef SUP_IP6 // HACK #include "ipv6_port.h" +#include "rb_unified2.h" /* Output plugin API functions */ static void OpSyslog_Exit(int signal,void *outputPlugin); @@ -346,7 +348,7 @@ return 0; }*/ -static int Syslog_FormatTrigger(OpSyslog_Data *syslogData, Unified2EventCommon *pEvent,int opType) +static int Syslog_FormatTrigger(OpSyslog_Data *syslogData, Unified2EventCommon *pEvent,uint32_t event_type,int opType) { char tSigBuf[256] = {0}; @@ -470,6 +472,20 @@ static int Syslog_FormatTrigger(OpSyslog_Data *syslogData, Unified2EventCommon * } } + if( OpSyslog_Concat(syslogData)) + { + /* XXX */ + FatalError("OpSyslog_Concat(): Failed \n"); + } + + if( ( syslogData->format_current_pos += snprintf(syslogData->formatBuffer,SYSLOG_MAX_QUERY_SIZE,"[Action:%s]", + actionOfEvent(pEvent,event_type)) >= SYSLOG_MAX_QUERY_SIZE)) + { + /* XXX */ + free(timestamp_string); + return 1; + } + if( OpSyslog_Concat(syslogData)) { /* XXX */ @@ -875,6 +891,13 @@ int Syslog_FormatPayload(OpSyslog_Data *data, Packet *p) { return OpSyslog_Concat(data); } +/* The event can be converted to Unified2EventCommon * */ +static int IsCommonEvent(const uint32_t event_type){ + return event_type == UNIFIED2_IDS_EVENT || + event_type == UNIFIED2_IDS_EVENT_IPV6 || + event_type == UNIFIED2_IDS_EVENT_VLAN || + event_type == UNIFIED2_IDS_EVENT_IPV6_VLAN; +} void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) { @@ -900,7 +923,7 @@ void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) return; } - if(event_type != UNIFIED2_IDS_EVENT) + if(!IsCommonEvent(event_type)) { LogMessage("OpSyslog_Alert(): Is currently unable to handle Event Type [%u] \n", event_type); @@ -1000,7 +1023,7 @@ void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) if( cn->name ) { if( (syslogContext->format_current_pos += snprintf(syslogContext->formatBuffer,SYSLOG_MAX_QUERY_SIZE, - "[Classification: %s] [Priority: %d]:", + "[Classification: %s] [Priority: %d] ", cn->name, ntohl(((Unified2EventCommon *)event)->priority_id))) >= SYSLOG_MAX_QUERY_SIZE) { @@ -1014,7 +1037,7 @@ void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) else if( ntohl(((Unified2EventCommon *)event)->priority_id) != 0 ) { if( (syslogContext->format_current_pos += snprintf(syslogContext->formatBuffer,SYSLOG_MAX_QUERY_SIZE, - "[Priority: %d]:", + "[Priority: %d] ", ntohl(((Unified2EventCommon *)event)->priority_id))) >= SYSLOG_MAX_QUERY_SIZE) { /* XXX */ @@ -1022,6 +1045,21 @@ void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) __FUNCTION__); } } + + if( OpSyslog_Concat(syslogContext)) + { + /* XXX */ + FatalError("OpSyslog_Concat(): Failed \n"); + } + + if( ( syslogContext->format_current_pos += snprintf(syslogContext->formatBuffer,SYSLOG_MAX_QUERY_SIZE, + "[Action: %s]:", + actionOfEvent(event,event_type)) >= SYSLOG_MAX_QUERY_SIZE)) + { + /* XXX */ + FatalError("[%s()], failed call to snprintf \n", + __FUNCTION__); + } if( OpSyslog_Concat(syslogContext)) { @@ -1116,7 +1154,7 @@ void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) case OUT_MODE_FULL: /* Ze verbose */ - if(Syslog_FormatTrigger(syslogContext, iEvent,0) ) + if(Syslog_FormatTrigger(syslogContext, iEvent,event_type,0) ) { LogMessage("WARNING: Unable to append Trigger header.\n"); return; @@ -1216,7 +1254,7 @@ void OpSyslog_Log(Packet *p, void *event, uint32_t event_type, void *arg) syslogContext->payload_current_pos = 0; syslogContext->format_current_pos = 0; - if(Syslog_FormatTrigger(syslogContext, iEvent,1) ) + if(Syslog_FormatTrigger(syslogContext, iEvent,event_type,1) ) { FatalError("WARNING: Unable to append Trigger header.\n"); } diff --git a/src/output-plugins/spo_syslog_full.h b/src/output-plugins/spo_syslog_full.h index 1f930dc..0d207fa 100644 --- a/src/output-plugins/spo_syslog_full.h +++ b/src/output-plugins/spo_syslog_full.h @@ -71,6 +71,7 @@ typedef struct _OpSyslog_Data char syslog_tx_facility[16]; char syslog_tx_priority[16]; + u_int8_t log_action; u_int32_t port; u_int16_t detail; diff --git a/src/rbutil/rb_unified2.h b/src/rbutil/rb_unified2.h index a125b05..d949969 100644 --- a/src/rbutil/rb_unified2.h +++ b/src/rbutil/rb_unified2.h @@ -30,4 +30,4 @@ #include -const char * actionOfEvent(const void * event,uint32_t event_type); +const char *actionOfEvent(const void *event,uint32_t event_type); From 078102a07592d2dd584b256a1302979a83ef09b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 29 Aug 2014 06:26:50 +0000 Subject: [PATCH 116/198] Added sensor name to output --- src/output-plugins/spo_syslog_full.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/output-plugins/spo_syslog_full.c b/src/output-plugins/spo_syslog_full.c index 5793d39..d75b5b0 100644 --- a/src/output-plugins/spo_syslog_full.c +++ b/src/output-plugins/spo_syslog_full.c @@ -970,6 +970,25 @@ void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) cn = ClassTypeLookupById(barnyard2_conf, ntohl(iEvent->classification_id)); + if( syslogContext->sensor_name ){ + if( (syslogContext->format_current_pos += snprintf(syslogContext->formatBuffer,SYSLOG_MAX_QUERY_SIZE, + "[Sensor name:%s] ", + syslogContext->sensor_name)) >= SYSLOG_MAX_QUERY_SIZE) + { + /* XXX */ + FatalError("[%s()], failed call to snprintf \n", + __FUNCTION__); + } + + if( OpSyslog_Concat(syslogContext)) + { + /* XXX */ + FatalError("OpSyslog_Concat(): Failed \n"); + } + + } + + if( (syslogContext->format_current_pos += snprintf(syslogContext->formatBuffer,SYSLOG_MAX_QUERY_SIZE, "[%u:%u:%u] ", ntohl(iEvent->generator_id), From 485110f55d6cfbd8d985989d4b6219093bc745bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 29 Aug 2014 06:31:56 +0000 Subject: [PATCH 117/198] Added sensor-group to syslog output plugin --- src/output-plugins/spo_syslog_full.c | 34 +++++++++++++++++++++++++++- src/output-plugins/spo_syslog_full.h | 1 + 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/output-plugins/spo_syslog_full.c b/src/output-plugins/spo_syslog_full.c index d75b5b0..22609e5 100644 --- a/src/output-plugins/spo_syslog_full.c +++ b/src/output-plugins/spo_syslog_full.c @@ -224,6 +224,12 @@ void OpSyslog_Exit(int signal,void *pSyslogContext) free(iSyslogContext->sensor_name); iSyslogContext->sensor_name = NULL; } + + if(iSyslogContext->sensor_group) + { + free(iSyslogContext->sensor_group); + iSyslogContext->sensor_group = NULL; + } NetClose(iSyslogContext); @@ -972,7 +978,7 @@ void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) if( syslogContext->sensor_name ){ if( (syslogContext->format_current_pos += snprintf(syslogContext->formatBuffer,SYSLOG_MAX_QUERY_SIZE, - "[Sensor name:%s] ", + "[Sensor name: %s] ", syslogContext->sensor_name)) >= SYSLOG_MAX_QUERY_SIZE) { /* XXX */ @@ -987,6 +993,24 @@ void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) } } + + if( syslogContext->sensor_group ){ + if( (syslogContext->format_current_pos += snprintf(syslogContext->formatBuffer,SYSLOG_MAX_QUERY_SIZE, + "[Sensor group: %s] ", + syslogContext->sensor_group)) >= SYSLOG_MAX_QUERY_SIZE) + { + /* XXX */ + FatalError("[%s()], failed call to snprintf \n", + __FUNCTION__); + } + + if( OpSyslog_Concat(syslogContext)) + { + /* XXX */ + FatalError("OpSyslog_Concat(): Failed \n"); + } + + } if( (syslogContext->format_current_pos += snprintf(syslogContext->formatBuffer,SYSLOG_MAX_QUERY_SIZE, @@ -1373,6 +1397,14 @@ OpSyslog_Data *OpSyslog_ParseArgs(char *args) LogMessage("Argument Error in %s(%i): %s\n", file_name, file_line, index); } + else if(strcasecmp("sensor_group", stoks[0]) == 0) + { + if(num_stoks > 1 && !op_data->sensor_group ) + op_data->sensor_group = strdup(stoks[1]); + else + LogMessage("Argument Error in %s(%i): %s\n", file_name, + file_line, index); + } else if(strcasecmp("protocol", stoks[0]) == 0) { if(num_stoks > 1) diff --git a/src/output-plugins/spo_syslog_full.h b/src/output-plugins/spo_syslog_full.h index 0d207fa..540bdf3 100644 --- a/src/output-plugins/spo_syslog_full.h +++ b/src/output-plugins/spo_syslog_full.h @@ -59,6 +59,7 @@ typedef struct _OpSyslog_Data { char *server; char *sensor_name; + char *sensor_group; u_int8_t log_context; u_int8_t payload_encoding; From 7099fe5b25d9970612719a7bbfe1397a4c1029e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 29 Aug 2014 06:39:08 +0000 Subject: [PATCH 118/198] Renamed "sensor name"->"sensor" and "sensor group"->"group" --- src/output-plugins/spo_syslog_full.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_syslog_full.c b/src/output-plugins/spo_syslog_full.c index 22609e5..38a2ea4 100644 --- a/src/output-plugins/spo_syslog_full.c +++ b/src/output-plugins/spo_syslog_full.c @@ -978,7 +978,7 @@ void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) if( syslogContext->sensor_name ){ if( (syslogContext->format_current_pos += snprintf(syslogContext->formatBuffer,SYSLOG_MAX_QUERY_SIZE, - "[Sensor name: %s] ", + "[Sensor: %s] ", syslogContext->sensor_name)) >= SYSLOG_MAX_QUERY_SIZE) { /* XXX */ @@ -996,7 +996,7 @@ void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) if( syslogContext->sensor_group ){ if( (syslogContext->format_current_pos += snprintf(syslogContext->formatBuffer,SYSLOG_MAX_QUERY_SIZE, - "[Sensor group: %s] ", + "[Group: %s] ", syslogContext->sensor_group)) >= SYSLOG_MAX_QUERY_SIZE) { /* XXX */ From b46067c6e614fdf2e0f686718b90b62a34c1194e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 1 Sep 2014 05:04:23 +0000 Subject: [PATCH 119/198] Added rbutils/Makefile.in, and headers guards --- .gitignore | 1 - src/rbutil/Makefile.in | 565 +++++++++++++++++++++++++++++++++++++++ src/rbutil/rb_unified2.h | 5 + 3 files changed, 570 insertions(+), 1 deletion(-) create mode 100644 src/rbutil/Makefile.in diff --git a/.gitignore b/.gitignore index f2491cb..d253bf0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,6 @@ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 Makefile -Makefile.in missing src/barnyard2 src/input-plugins/libspi.a diff --git a/src/rbutil/Makefile.in b/src/rbutil/Makefile.in new file mode 100644 index 0000000..e00411a --- /dev/null +++ b/src/rbutil/Makefile.in @@ -0,0 +1,565 @@ +# Makefile.in generated by automake 1.13.4 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/rbutil +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +librbutil_a_AR = $(AR) $(ARFLAGS) +librbutil_a_LIBADD = +am_librbutil_a_OBJECTS = rb_kafka.$(OBJEXT) \ + rb_numstrpair_list.$(OBJEXT) rb_unified2.$(OBJEXT) +librbutil_a_OBJECTS = $(am_librbutil_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = +am__depfiles_maybe = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(librbutil_a_SOURCES) +DIST_SOURCES = $(librbutil_a_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INCLUDES = -I.. -I../sfutil +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TCLSH = @TCLSH@ +VERSION = @VERSION@ +YACC = @YACC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +extra_incl = @extra_incl@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign no-dependencies +noinst_LIBRARIES = librbutil.a +librbutil_a_SOURCES = rb_kafka.c rb_kafka.h rb_numstrpair_list.h rb_numstrpair_list.c rb_unified2.c +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/rbutil/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/rbutil/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +librbutil.a: $(librbutil_a_OBJECTS) $(librbutil_a_DEPENDENCIES) $(EXTRA_librbutil_a_DEPENDENCIES) + $(AM_V_at)-rm -f librbutil.a + $(AM_V_AR)$(librbutil_a_AR) librbutil.a $(librbutil_a_OBJECTS) $(librbutil_a_LIBADD) + $(AM_V_at)$(RANLIB) librbutil.a + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +.c.o: + $(AM_V_CC)$(COMPILE) -c $< + +.c.obj: + $(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/rbutil/rb_unified2.h b/src/rbutil/rb_unified2.h index d949969..9a3eac9 100644 --- a/src/rbutil/rb_unified2.h +++ b/src/rbutil/rb_unified2.h @@ -28,6 +28,11 @@ * @brief Declares redBorder utilities to work with unified2 events */ +#ifndef RB_UNIFIED_H +#define RB_UNIFIED_H + #include const char *actionOfEvent(const void *event,uint32_t event_type); + +#endif From b3f9d7291160387a957ae16a781fcadd75accd7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Tue, 2 Sep 2014 13:49:10 +0000 Subject: [PATCH 120/198] Increased syslog human-readable IP buffers size, in order to accomodate ipv6 --- src/output-plugins/spo_syslog_full.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_syslog_full.c b/src/output-plugins/spo_syslog_full.c index 38a2ea4..7878466 100644 --- a/src/output-plugins/spo_syslog_full.c +++ b/src/output-plugins/spo_syslog_full.c @@ -914,8 +914,8 @@ void OpSyslog_Alert(Packet *p, void *event, uint32_t event_type, void *arg) ClassType *cn = NULL; - char sip[16] = {0}; - char dip[16] = {0}; + char sip[INET6_ADDRSTRLEN] = {0}; + char dip[INET6_ADDRSTRLEN] = {0}; if( (p == NULL) || (event == NULL) || From a38c8087bce1e5339c27a7e67424cbb0e8465f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Thu, 30 Oct 2014 09:51:58 +0000 Subject: [PATCH 121/198] FIX: Ports were using as uint8_t, instead of uint16_t --- src/output-plugins/spo_alert_json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 5f29aa1..285a08b 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -989,12 +989,12 @@ static uint8_t extract_proto(const void *_event, uint32_t event_type, Packet *p) } } -static uint8_t extract_port_from_packet(Packet *p,int srcdst_req) +static uint16_t extract_port_from_packet(Packet *p,int srcdst_req) { return ntohs(srcdst_req == SRC_REQ ? p->sp : p->dp); } -static uint8_t extract_port0(const void *_event, uint32_t event_type, Packet *p,int srcdst_req) +static uint16_t extract_port0(const void *_event, uint32_t event_type, Packet *p,int srcdst_req) { if(!(srcdst_req == SRC_REQ || srcdst_req == DST_REQ)) { From 6099b36c200584b61d69d39fd7beed81fd569a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Thu, 30 Oct 2014 10:29:48 +0000 Subject: [PATCH 122/198] FIX: bad IPlength --- src/output-plugins/spo_alert_json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 285a08b..d7198b9 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1686,12 +1686,12 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, break; case IPLEN: if(p && IPH_IS_VALID(p)) - KafkaLog_Puts(kafka,itoa10(GET_IPH_LEN(p) << 2,buf,bufLen)); + KafkaLog_Puts(kafka,itoa10(ntohs(GET_IPH_LEN(p)),buf,bufLen)); break; case IPLEN_RANGE: if(p && IPH_IS_VALID(p)) { - const double log2_len = log2(GET_IPH_LEN(p) << 2); + const double log2_len = log2(ntohs(GET_IPH_LEN(p))); const unsigned int lower_limit = pow(2.0,floor(log2_len)); const unsigned int upper_limit = pow(2.0,ceil(log2_len)); //printf("log2_len: %0lf; floor: %0lf; ceil: %0lf; low_limit: %0lf; upper_limit:%0lf\n", From e0ea4418ff6f66d1f82961729709995d90f5ae0d Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Thu, 26 Mar 2015 11:23:04 +0000 Subject: [PATCH 123/198] Included Extra Data counts in Records --- src/barnyard2.h | 3 +++ src/spooler.c | 5 +++++ src/util.c | 8 ++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/barnyard2.h b/src/barnyard2.h index 0039d42..3ed94c1 100644 --- a/src/barnyard2.h +++ b/src/barnyard2.h @@ -428,6 +428,9 @@ typedef struct _PacketCount uint64_t total_records; uint64_t total_events; uint64_t total_packets; +//rb:ini + uint64_t total_extra_data; +//rb:fin uint64_t total_processed; uint64_t total_unknown; uint64_t total_suppressed; diff --git a/src/spooler.c b/src/spooler.c index b479af8..17c6292 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -707,6 +707,11 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) case UNIFIED2_IDS_EVENT_IPV6_VLAN: pc.total_events++; break; +//rb:ini + case UNIFIED2_EXTRA_DATA: + pc.total_extra_data++; + break; +//rb:fin default: pc.total_unknown++; } diff --git a/src/util.c b/src/util.c index 2a2d7a4..5718997 100644 --- a/src/util.c +++ b/src/util.c @@ -838,13 +838,17 @@ void DropStats(int exiting) LogMessage("Record Totals:\n"); LogMessage(" Records:" FMTu64("12") "\n", pc.total_records); - LogMessage(" Events:" FMTu64("12") " (%.3f%%)\n", pc.total_events, + LogMessage(" Events:" FMTu64("13") " (%.3f%%)\n", pc.total_events, CalcPct(pc.total_events, pc.total_records)); LogMessage(" Packets:" FMTu64("12") " (%.3f%%)\n", pc.total_packets, CalcPct(pc.total_packets, pc.total_records)); +//rb:ini + LogMessage(" Extra Data:" FMTu64("9") " (%.3f%%)\n", pc.total_extra_data, + CalcPct(pc.total_extra_data, pc.total_records)); +//rb:fin LogMessage(" Unknown:" FMTu64("12") " (%.3f%%)\n", pc.total_unknown, CalcPct(pc.total_unknown, pc.total_records)); - LogMessage(" Suppressed:" FMTu64("12") " (%.3f%%)\n", pc.total_suppressed, + LogMessage(" Suppressed:" FMTu64("9") " (%.3f%%)\n", pc.total_suppressed, CalcPct(pc.total_suppressed, pc.total_records)); total = pc.total_packets; From 13cbf2340c4919af7161763fed2824924420292e Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Mon, 30 Mar 2015 12:12:33 +0000 Subject: [PATCH 124/198] Preparing spo_alert_json.c, plugbase.c and plugbase.h. Perhaps we will have to roll back to undo these changes. --- src/output-plugins/spo_alert_json.c | 27 ++++++++++++++++++++++++++- src/plugbase.c | 3 ++- src/plugbase.h | 5 ++++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index d7198b9..acd47bf 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -93,7 +93,10 @@ // Note: Always including ,sensor_name,domain_name,group_name,src_net_name,src_as_name,dst_net_name,dst_as_name //#define SEND_NAMES -#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" +//#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" +//rb:ini +#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,file_sha256,file_size,file_hostname,file_uri,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" +//rb:fin #ifdef HAVE_GEOIP #define DEFAULT_JSON_1 DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ @@ -145,6 +148,12 @@ typedef enum{ ACTION, CLASSIFICATION, MSG, +//rb:ini + FILE_SHA256, + FILE_SIZE, + FILE_HOSTNAME, + FILE_URI, +//rb:fin PAYLOAD, PROTO, PROTO_ID, @@ -272,6 +281,12 @@ static AlertJSONTemplateElement template[] = { {PRIORITY,"priority","priority",stringFormat,"unknown"}, {CLASSIFICATION,"classification","classification",stringFormat,"-"}, {MSG,"msg","msg",stringFormat,"-"}, +//rb:ini + {FILE_SHA256,"file_sha256","file_sha256",stringFormat,"-"}, + {FILE_SIZE,"file_size","file_size",stringFormat,"-"}, + {FILE_HOSTNAME,"file_hostname","file_hostname",stringFormat,"-"}, + {FILE_URI,"file_uri","file_uri",stringFormat,"-"}, +//rb:fin {PAYLOAD,"payload","payload",stringFormat,"-"}, {PROTO,"l4_proto_name","l4_proto_name",stringFormat,"-"}, {PROTO_ID,"l4_proto","l4_proto",numericFormat,"0"}, @@ -1353,6 +1368,16 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, } } break; +//rb:ini + case FILE_SHA256: + break; + case FILE_SIZE: + break; + case FILE_URI: + break; + case FILE_HOSTNAME: + break; +//rb:fin case PAYLOAD: { uint16_t i; diff --git a/src/plugbase.c b/src/plugbase.c index 68f6bb5..e518dc1 100644 --- a/src/plugbase.c +++ b/src/plugbase.c @@ -681,7 +681,8 @@ void CallOutputPlugins(OutputType out_type, Packet *packet, void *event, uint32_ return; } - +//rb:ini (this piece of code should probably be altered) +//rb:fin if (out_type == OUTPUT_TYPE__SPECIAL) { idx = AlertList; diff --git a/src/plugbase.h b/src/plugbase.h index fbab76e..5c2ea4a 100644 --- a/src/plugbase.h +++ b/src/plugbase.h @@ -86,7 +86,10 @@ typedef enum _OutputType OUTPUT_TYPE__ALERT = 1, OUTPUT_TYPE__LOG, OUTPUT_TYPE__SPECIAL, - OUTPUT_TYPE__MAX + OUTPUT_TYPE__MAX, +//rb:ini + OUTPUT_TYPE__EXTRA_DATA +//rb:fin } OutputType; From 411cc8f6777a6dcc844320281935ceeca4cc3f2e Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Tue, 31 Mar 2015 13:56:04 +0000 Subject: [PATCH 125/198] Flush cached event after TIME_ALARM seconds: Setting Alarm --- src/barnyard2.c | 54 ++++++++++++++++++++++++++++++++++++++++--------- src/barnyard2.h | 9 +++++++++ src/spooler.c | 14 +++++++++++++ 3 files changed, 68 insertions(+), 9 deletions(-) diff --git a/src/barnyard2.c b/src/barnyard2.c index d6f41e9..bf9535b 100644 --- a/src/barnyard2.c +++ b/src/barnyard2.c @@ -55,9 +55,11 @@ #endif #include -#ifdef TIMESTATS -# include /* added for new time stats function in util.c */ -#endif +//rb:ini (disable the unused time stats ) +//#ifdef TIMESTATS +//# include /* added for new time stats function in util.c */ +//#endif +//rb:ini #ifdef HAVE_STRINGS_H # include @@ -132,6 +134,9 @@ VarNode *cmd_line_var_list = NULL; int exit_signal = 0; static int usr_signal = 0; +//rb:ini +static int alarm_raised = 0; +//rb:fin static volatile int hup_signal = 0; volatile int barnyard2_initializing = 1; @@ -236,6 +241,9 @@ int SignalCheck(void); static void SigExitHandler(int); static void SigUsrHandler(int); static void SigHupHandler(int); +//rb:ini +static void SigAlrmHandler(int); +//rb:fin /* F U N C T I O N D E F I N I T I O N S **********************************/ @@ -1054,6 +1062,13 @@ static void SigHupHandler(int signal) return; } +//rb:ini +static void SigAlrmHandler(int signal) +{ + alarm_raised = 1; +} +//rb:fin + /**************************************************************************** * * Function: CleanExit() @@ -1421,6 +1436,25 @@ int SignalCheck(void) return 0; } +//rb:ini +/* check for alarm activity */ +int AlarmCheck(void) +{ + return alarm_raised; +} + +/* start alarm */ +void AlarmStart(int time_alarm) +{ + alarm(time_alarm); +} + +/* clear alarm */ +void AlarmClear(void) +{ + alarm_raised = 0; +} +//rb:fin static void InitGlobals(void) { @@ -2144,13 +2178,15 @@ static void InitSignals(void) signal(SIGINT, SigExitHandler); signal(SIGQUIT, SigExitHandler); signal(SIGUSR1, SigUsrHandler); - -#ifdef TIMESTATS - /* Establish a handler for SIGALRM signals and set an alarm to go off - * in approximately one hour. This is used to drop statistics at - * an interval which the alarm will tell us to do. */ +//rb:ini (define an own SigAlrmHandler and discard the previous and unused one) signal(SIGALRM, SigAlrmHandler); -#endif +//#ifdef TIMESTATS +// /* Establish a handler for SIGALRM signals and set an alarm to go off +// * in approximately one hour. This is used to drop statistics at +// * an interval which the alarm will tell us to do. */ +// signal(SIGALRM, SigAlrmHandler); +//#endif +//rb:fin signal(SIGHUP, SigHupHandler); diff --git a/src/barnyard2.h b/src/barnyard2.h index 3ed94c1..6345604 100644 --- a/src/barnyard2.h +++ b/src/barnyard2.h @@ -146,6 +146,10 @@ //# define PRINT_INTERFACE(i) print_interface(i) #endif +//rb:ini +#define TIME_ALARM 2 // seconds to flush the last cached event +//rb:fin + /* D A T A S T R U C T U R E S *********************************************/ typedef struct _VarEntry { @@ -578,6 +582,11 @@ Barnyard2Config * Barnyard2ConfNew(void); int Barnyard2Main(int argc, char *argv[]); int Barnyard2Sleep(unsigned int); int SignalCheck(void); +//rb:ini +int AlarmCheck(void); +void AlarmStart(int time_alarm); +void AlarmClear(void); +//rb:fin void CleanExit(int); void SigCantHupHandler(int signal); diff --git a/src/spooler.c b/src/spooler.c index 17c6292..87bc426 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -406,6 +406,7 @@ int ProcessBatch(const char *dirpath, const char *filename) spoolerFreeRecord(&spooler->record); break; } + } /* we've finished with the spooler so destroy and cleanup */ @@ -455,6 +456,15 @@ int ProcessContinuous(const char *dirpath, const char *filebase, /* Start the main process loop */ while (exit_signal == 0) { +//rb:ini + if (AlarmCheck()) + { + //if(cache not empty) + //flush cache + AlarmClear(); + } +//rb:fin + /* for SIGUSR1 / dropstats */ SignalCheck(); @@ -866,6 +876,10 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) /* clean the cache out */ spoolerEventCacheClean(spooler); +//rb:ini + /* If there is no more records in TIME_ALARM seconds flush the cached records */ + AlarmStart(TIME_ALARM); +//rb:fin } static int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) From fe432e5880cfbfe5b7b41252200ea70eb29c2c82 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Tue, 7 Apr 2015 10:03:33 +0000 Subject: [PATCH 126/198] Changing the way spoolerProcessRecord works and including Extra Data in EventRecordNode->data --- src/barnyard2.c | 2 +- src/input-plugins/spi_unified2.c | 13 +++ src/spooler.c | 165 +++++++++++++++++++++++++++++++ src/spooler.h | 11 +++ src/unified2.h | 57 +++++++++++ 5 files changed, 247 insertions(+), 1 deletion(-) diff --git a/src/barnyard2.c b/src/barnyard2.c index bf9535b..2479f61 100644 --- a/src/barnyard2.c +++ b/src/barnyard2.c @@ -55,7 +55,7 @@ #endif #include -//rb:ini (disable the unused time stats ) +//rb:ini (disable the unused time stats) //#ifdef TIMESTATS //# include /* added for new time stats function in util.c */ //#endif diff --git a/src/input-plugins/spi_unified2.c b/src/input-plugins/spi_unified2.c index 945289b..372f20d 100644 --- a/src/input-plugins/spi_unified2.c +++ b/src/input-plugins/spi_unified2.c @@ -177,7 +177,20 @@ int Unified2ReadRecord(void *sph) if(!spooler->record.data) { /* SnortAlloc will FatalError if memory can't be assigned */ +//rb:ini +#ifdef rbtest_spi_unified2 + spooler->record.data = SnortAlloc(record_length+sizeof(void *)+sizeof(ExtraDataRecordCache)/*+sizeof(uint32_t)*/); + + /* Habría que poner a NULL el puntero a paquete (...WithEDP->pkt) */ + //(((char *)(spooler->record.data))+record_length) = NULL; + //((Unified2IDSEvent_WithPED *)ernNode->data)->packet = NULL; + + TAILQ_INIT((ExtraDataRecordCache *)(((char *)(spooler->record.data))+record_length)+sizeof(void *)); + //*(&(spooler->record.data)+record_length+sizeof(ExtraDataRecordCache)) = NULL; +#else spooler->record.data = SnortAlloc(record_length); +#endif +//rb:fin } if (spooler->offset < record_length) diff --git a/src/spooler.c b/src/spooler.c index 87bc426..cafa7bb 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -58,6 +58,9 @@ static int spoolerOpenWaldo(Waldo *, uint8_t); int spoolerCloseWaldo(Waldo *); static int spoolerEventCachePush(Spooler *, uint32_t, void *); +//rb:ini +static int spoolerExtraDataCachePush(Spooler *, uint32_t, void *, EventRecordNode *); +//rb:fin static EventRecordNode * spoolerEventCacheGetByEventID(Spooler *, uint32_t); static EventRecordNode * spoolerEventCacheGetHead(Spooler *); static uint8_t spoolerEventCacheHeadUsed(Spooler *); @@ -761,6 +764,38 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Packet has been rebuilt from a stream\n");); } +//rb:ini +#ifdef rbtest_spooler + /* if the packet and cached event share the same id */ + if (ernCache != NULL) + { + /* add the packet into the cached event */ + switch (ernCache->type) + { + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + /* if there is no previous packet */ + if (((Unified2IDSEvent_WithPED *)ernCache->data)->packet == NULL) + ((Unified2IDSEvent_WithPED *)ernCache->data)->packet = spooler->record.pkt; + /* when != NULL there is a previous packet cached with the event. do nothing here. */ + break; + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + /* if there is no previous packet */ + if (((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet == NULL) + ((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet = spooler->record.pkt; + /* when != NULL there is a previous packet cached with the event. do nothing here. */ + break; + } + } + //else + //{ + // We are assuming that a packet record will never show up before an event record does + // This hypothetical case should be taken into account after testings + //} +#else /* if the packet and cached event share the same id */ if ( ernCache != NULL ) { @@ -810,6 +845,8 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) /* free the memory allocated in this function */ free(spooler->record.pkt); spooler->record.pkt = NULL; +#endif +//rb:fin /* waldo operations occur after the output plugins are called */ if (fire_output) @@ -828,11 +865,62 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) ernCache = spoolerEventCacheGetHead(spooler); +//rb:ini +#ifdef rbtest_spooler + /* not checked ernCache->used == 0 since this cached event must be fired in any case, + even though the expected value should be ernCache->used = 0 */ + if (fire_output) + { + switch (ernCache->type) + { + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + /* if there is a cached packet */ + if (((Unified2IDSEvent_WithPED *)ernCache->data)->packet != NULL) + { + CallOutputPlugins(OUTPUT_TYPE__SPECIAL, + ((Unified2IDSEvent_WithPED *)ernCache->data)->packet, + ernCache->data, + ernCache->type); + free(((Unified2IDSEvent_WithPED *)ernCache->data)->packet); + ((Unified2IDSEvent_WithPED *)ernCache->data)->packet = NULL; + } + else + CallOutputPlugins(OUTPUT_TYPE__ALERT, + NULL, + ernCache->data, + ernCache->type); + break; + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + /* if there is a cached packet */ + if (((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet != NULL) + { + CallOutputPlugins(OUTPUT_TYPE__SPECIAL, + ((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet, + ernCache->data, + ernCache->type); + free(((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet); + ((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet = NULL; + } + else + CallOutputPlugins(OUTPUT_TYPE__ALERT, + NULL, + ernCache->data, + ernCache->type); + break; + } + } +#else if (fire_output) CallOutputPlugins(OUTPUT_TYPE__ALERT, NULL, ernCache->data, ernCache->type); +#endif +//rb:fin /* flush the event cache flag */ ernCache->used = 1; @@ -848,6 +936,27 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) } else if (type == UNIFIED2_EXTRA_DATA) { +//rb:ini + /* convert event id once */ + uint32_t event_id = ntohl(((Unified2ExtraData *)(((Unified2ExtraDataHdr *)spooler->record.data)+1))->event_id); + + /* check if there is a previously cached event that matches this event id */ + ernCache = spoolerEventCacheGetByEventID(spooler, event_id); + + /* if the packet and cached event share the same id */ + if ( ernCache != NULL ) + { + /* include extra data record */ + spoolerExtraDataCachePush(spooler, type, /*((Unified2ExtraDataHdr *)spooler->record.data)+1*/spooler->record.data, ernCache); + spooler->record.data = NULL; + } + //else + //{ + // We are assuming that an extra data record will never show up before an event record does + // This hypothetical case should be taken into account after testings + //} +//rb:fin + /* waldo operations occur after the output plugins are called */ if (fire_output) spoolerWriteWaldo(&barnyard2_conf->waldo, spooler); @@ -896,6 +1005,10 @@ static int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) ernNode->type = type; ernNode->data = data; +//rb:ini (Si no se consigue inicializar a NULL en spi_unified2.c, habría que plantearse hacerlo aquí.) + ((Unified2IDSEvent_WithPED *)ernNode->data)->packet = NULL; +//rb:fin + /* add new events to the front of the cache */ TAILQ_INSERT_HEAD(&spooler->event_cache, ernNode, entry); spooler->events_cached++; @@ -905,6 +1018,31 @@ static int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) return 0; } +//rb:ini (En TAILQ_INSERT_HEAD hay que distinguir entre IPv4 e IPv6) +static int spoolerExtraDataCachePush(Spooler *spooler, uint32_t type, void *data, EventRecordNode *ernNode) +{ + ExtraDataRecordNode *edrnNode; + + DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Including extra data with cached event %lu\n",ntohl(((Unified2EventCommon *)data)->event_id));); + + /* allocate memory */ + edrnNode = (ExtraDataRecordNode *)SnortAlloc(sizeof(ExtraDataRecordNode)); + + /* create the new node */ + edrnNode->used = 0; + edrnNode->type = type; + edrnNode->data = data; + + /* add new extra data to the front of the cache */ + TAILQ_INSERT_HEAD((ExtraDataRecordCache *)&((Unified2IDSEvent_WithPED *)(ernNode->data))->extra_data_cache, edrnNode, entry); + //((Unified2IDSEvent_WithExtra *)data)->extra_data_cached++; + + //DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Cached extra data record: %d\n", ((Unified2IDSEvent_WithExtra *)data)->extra_data_cached);); + + return 0; +} +//rb:fin + static EventRecordNode *spoolerEventCacheGetByEventID(Spooler *spooler, uint32_t event_id) { EventRecordNode *ernCurrent = NULL; @@ -965,6 +1103,33 @@ static int spoolerEventCacheClean(Spooler *spooler) if(ernCurrent->data != NULL) { +//rb:ini (Liberar memoria (TAILQ_REMOVE). Hay que ver si se hace aquí) +#ifdef AAOSOFOSO +//#ifdef rbtest_spi_unified2 + switch (ernCurrent->type) + { + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + /* if there is no previous packet */ + if (((Unified2IDSEvent_WithPED *)ernCache->data)->packet == NULL) + //((Unified2IDSEvent_WithPED *)ernCache->data)->packet = spooler->record.pkt; + TAILQ_INIT((Unified2IDSEvent_WithPED *)ernCurrent->data)->extra_data_cache)); + /* when != NULL there is a previous packet cached with the event. do nothing here. */ + break; + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + /* if there is no previous packet */ + if (((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet == NULL) + //((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet = spooler->record.pkt; + TAILQ_INIT((ExtraDataRecordCache *)(((char *)(spooler->record.data))+record_length)+sizeof(void *)); + /* when != NULL there is a previous packet cached with the event. do nothing here. */ + break; + } + //TAILQ_INIT((ExtraDataRecordCache *)(((char *)(spooler->record.data))+record_length)+sizeof(void *)); +#endif +//rb:fin free(ernCurrent->data); } diff --git a/src/spooler.h b/src/spooler.h index b54eca2..a40d017 100644 --- a/src/spooler.h +++ b/src/spooler.h @@ -31,6 +31,9 @@ #include #include "plugbase.h" +//rb:ini +#include "unified2.h" +//rb:fin #define SPOOLER_EXTENSION_FOUND 0 #define SPOOLER_EXTENSION_NONE 1 @@ -59,6 +62,14 @@ #define MAX_FILEPATH_BUF 1024 +//rb:ini (test) +#define rbtest +#ifdef rbtest + #define rbtest_spooler + #define rbtest_spi_unified2 +#endif +//rb:fin (test) + typedef struct _Record { /* raw data */ diff --git a/src/unified2.h b/src/unified2.h index a04b3e6..ee0d710 100644 --- a/src/unified2.h +++ b/src/unified2.h @@ -30,6 +30,10 @@ #include "config.h" #endif +//rb:ini +#include +//rb:fin + //SNORT DEFINES //Long time ago... #define UNIFIED2_EVENT 1 @@ -44,6 +48,19 @@ #define UNIFIED2_IDS_EVENT_IPV6_VLAN 105 #define UNIFIED2_EXTRA_DATA 110 +//rb:ini +typedef struct _ExtraDataRecordNode +{ + uint32_t type; + void *data; + uint8_t used; + + TAILQ_ENTRY(_ExtraDataRecordNode) entry; +} ExtraDataRecordNode; + +typedef TAILQ_HEAD(_ExtraDataRecordList, _ExtraDataRecordNode) ExtraDataRecordCache; +//rb:fin + /* Each unified2 record will start out with one of these */ typedef struct _Unified2RecordHeader { @@ -77,6 +94,16 @@ typedef struct _Unified2IDSEvent uint16_t pad2;//Policy ID } Unified2IDSEvent; +//rb:ini +typedef struct _Unified2IDSEvent_WithPED +{ + Unified2IDSEvent event; + void *packet; + ExtraDataRecordCache extra_data_cache; + //uint32_t extra_data_cached; +}Unified2IDSEvent_WithPED; +//rb:fin + //UNIFIED2_IDS_EVENT_IPV6_VLAN = type 105 typedef struct _Unified2IDSEventIPv6 { @@ -102,6 +129,16 @@ typedef struct _Unified2IDSEventIPv6 uint16_t pad2;/*could be IPS Policy local id to support local sensor alerts*/ } Unified2IDSEventIPv6; +//rb:ini +typedef struct _Unified2IDSEventIPv6_WithPED +{ + Unified2IDSEventIPv6 event; + void *packet; + ExtraDataRecordCache extra_data_cache; //linked list of concurrent extra data records + //uint32_t extra_data_cached; +}Unified2IDSEventIPv6_WithPED; +//rb:fin + //UNIFIED2_PACKET = type 2 typedef struct _Unified2Packet { @@ -176,6 +213,16 @@ typedef struct Unified2IDSEvent_legacy uint8_t blocked; } Unified2IDSEvent_legacy; +//rb:ini +typedef struct _Unified2IDSEvent_legacy_WithPED +{ + Unified2IDSEventIPv6 event; + void *packet; + ExtraDataRecordCache extra_data_cache; //linked list of concurrent extra data records + //uint32_t extra_data_cached; +}Unified2IDSEvent_legacy_WithPED; +//rb:fin + //----------LEGACY, type '72' typedef struct Unified2IDSEventIPv6_legacy { @@ -198,6 +245,16 @@ typedef struct Unified2IDSEventIPv6_legacy uint8_t blocked; } Unified2IDSEventIPv6_legacy; +//rb:ini +typedef struct _Unified2IDSEventIPv6_legacy_WithPED +{ + Unified2IDSEventIPv6 event; + void *packet; + ExtraDataRecordCache extra_data_cache; //linked list of concurrent extra data records + //uint32_t extra_data_cached; +}Unified2IDSEventIPv6_legacy_WithPED; +//rb:fin + ////////////////////-->LEGACY From 8a01fd917492905996be1bc989e53b535aa44885 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Tue, 7 Apr 2015 15:42:43 +0000 Subject: [PATCH 127/198] Fire remained events before closing spooler when EOF is reached --- src/spooler.c | 170 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 127 insertions(+), 43 deletions(-) diff --git a/src/spooler.c b/src/spooler.c index cafa7bb..91bb558 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -60,6 +60,9 @@ int spoolerCloseWaldo(Waldo *); static int spoolerEventCachePush(Spooler *, uint32_t, void *); //rb:ini static int spoolerExtraDataCachePush(Spooler *, uint32_t, void *, EventRecordNode *); +static EventRecordNode * spoolerEventCacheGetBySpooler(Spooler *); +static int spoolerFireLastEvent(Spooler *); +static int spoolerCallOutputPluginsByERN (EventRecordNode *); //rb:fin static EventRecordNode * spoolerEventCacheGetByEventID(Spooler *, uint32_t); static EventRecordNode * spoolerEventCacheGetHead(Spooler *); @@ -225,6 +228,15 @@ int spoolerClose(Spooler *spooler) if (spooler == NULL) return -1; +//rb:ini + if (spoolerFireLastEvent(spooler)) + LogMessage("Last cached event from spool file '%s' fired\n", + spooler->filepath); + else + LogMessage("Last cached event from spool file '%s' couldn't be fired\n", + spooler->filepath); +//rb:fin + LogMessage("Closing spool file '%s'. Read %d records\n", spooler->filepath, spooler->record_idx); @@ -870,49 +882,7 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) /* not checked ernCache->used == 0 since this cached event must be fired in any case, even though the expected value should be ernCache->used = 0 */ if (fire_output) - { - switch (ernCache->type) - { - case UNIFIED2_IDS_EVENT: - case UNIFIED2_IDS_EVENT_MPLS: - case UNIFIED2_IDS_EVENT_VLAN: - /* if there is a cached packet */ - if (((Unified2IDSEvent_WithPED *)ernCache->data)->packet != NULL) - { - CallOutputPlugins(OUTPUT_TYPE__SPECIAL, - ((Unified2IDSEvent_WithPED *)ernCache->data)->packet, - ernCache->data, - ernCache->type); - free(((Unified2IDSEvent_WithPED *)ernCache->data)->packet); - ((Unified2IDSEvent_WithPED *)ernCache->data)->packet = NULL; - } - else - CallOutputPlugins(OUTPUT_TYPE__ALERT, - NULL, - ernCache->data, - ernCache->type); - break; - case UNIFIED2_IDS_EVENT_IPV6: - case UNIFIED2_IDS_EVENT_IPV6_MPLS: - case UNIFIED2_IDS_EVENT_IPV6_VLAN: - /* if there is a cached packet */ - if (((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet != NULL) - { - CallOutputPlugins(OUTPUT_TYPE__SPECIAL, - ((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet, - ernCache->data, - ernCache->type); - free(((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet); - ((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet = NULL; - } - else - CallOutputPlugins(OUTPUT_TYPE__ALERT, - NULL, - ernCache->data, - ernCache->type); - break; - } - } + spoolerCallOutputPluginsByERN(ernCache); #else if (fire_output) CallOutputPlugins(OUTPUT_TYPE__ALERT, @@ -1012,6 +982,9 @@ static int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) /* add new events to the front of the cache */ TAILQ_INSERT_HEAD(&spooler->event_cache, ernNode, entry); spooler->events_cached++; +//rb:ini (test) + //printf ("spooler: %x | Cached event %d with id '%d'\n", (int )(&spooler), spooler->events_cached, ntohl(((Unified2EventCommon *)data)->event_id)); +//rb:fin DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Cached event: %d\n", spooler->events_cached);); @@ -1041,6 +1014,117 @@ static int spoolerExtraDataCachePush(Spooler *spooler, uint32_t type, void *data return 0; } + +/* Fire the last cached event if it exists */ +static EventRecordNode *spoolerEventCacheGetBySpooler(Spooler *spooler) +{ + uint32_t event_id; + uint32_t type; + EventRecordNode *ernCache; + + if (spooler == NULL) + return NULL; + + if (spooler->record.header == NULL) + return NULL; + + if (spooler->record.data == NULL) + return NULL; + + /* event type */ + type = ntohl(((Unified2RecordHeader *)spooler->record.header)->type); + + /* event id */ + switch (type) + { + case UNIFIED2_PACKET: + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + event_id = ntohl(((Unified2EventCommon *)spooler->record.data)->event_id); + break; + case UNIFIED2_EXTRA_DATA: + event_id = ntohl(((Unified2ExtraData *)(((Unified2ExtraDataHdr *)spooler->record.data)+1))->event_id); + break; + } + + /* check if there is a previously cached event that matches this event id */ + ernCache = spoolerEventCacheGetByEventID(spooler, event_id); + + return ernCache; +} + +static int spoolerFireLastEvent(Spooler *spooler) +{ + int ret; + EventRecordNode *ernCache; + + ernCache = spoolerEventCacheGetBySpooler(spooler); + + if (ernCache == NULL) + ret = 0; + else + ret = spoolerCallOutputPluginsByERN(ernCache); + + return ret; +} + +static int spoolerCallOutputPluginsByERN(EventRecordNode *ern) +{ + int ret; + + if (ern == NULL) + ret = 0; + else + { + switch (ern->type) + { + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + /* if there is a cached packet */ + if (((Unified2IDSEvent_WithPED *)ern->data)->packet != NULL) + { + CallOutputPlugins(OUTPUT_TYPE__SPECIAL, + ((Unified2IDSEvent_WithPED *)ern->data)->packet, + ern->data, + ern->type); + free(((Unified2IDSEvent_WithPED *)ern->data)->packet); + ((Unified2IDSEvent_WithPED *)ern->data)->packet = NULL; + } + else + CallOutputPlugins(OUTPUT_TYPE__ALERT, + NULL, + ern->data, + ern->type); + break; + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + /* if there is a cached packet */ + if (((Unified2IDSEventIPv6_WithPED *)ern->data)->packet != NULL) + { + CallOutputPlugins(OUTPUT_TYPE__SPECIAL, + ((Unified2IDSEventIPv6_WithPED *)ern->data)->packet, + ern->data, + ern->type); + free(((Unified2IDSEventIPv6_WithPED *)ern->data)->packet); + ((Unified2IDSEventIPv6_WithPED *)ern->data)->packet = NULL; + } + else + CallOutputPlugins(OUTPUT_TYPE__ALERT, + NULL, + ern->data, + ern->type); + break; + } + ret = 1; + } + return ret; +} //rb:fin static EventRecordNode *spoolerEventCacheGetByEventID(Spooler *spooler, uint32_t event_id) From e17f8789e0727f95f9e99a53e3037e163f40baa3 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Thu, 9 Apr 2015 17:33:46 +0000 Subject: [PATCH 128/198] rd_unified2.c modified: fixing macro and actionOfEvent --- src/rbutil/rb_unified2.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/rbutil/rb_unified2.c b/src/rbutil/rb_unified2.c index 64a5685..934e450 100644 --- a/src/rbutil/rb_unified2.c +++ b/src/rbutil/rb_unified2.c @@ -35,6 +35,12 @@ #include "unified2.h" #include +#define U2_FLAG_ALLOWED 0x00 // impact_flag = 0 (packet allowed) +#define U2_FLAG_BLOCKED 0x20 // impact_flag = 32 (packet dropped) +#define U2_BLOCKED_FLAG_ALLOW 0x00 // blocked = 0 (packet allowed) +#define U2_BLOCKED_FLAG_BLOCK 0x01 // blocked = 2 (packet dropped) +#define U2_BLOCKED_FLAG_WOULD 0x02 // blocked = 3 (packet would have been dropped) +#define U2_BLOCKED_FLAG_CANT 0x03 // blocked = 4 (packet cant be dropped) #define EVENT_IMPACT_FLAG(e) e->impact_flag #define EVENT_BLOCKED(e) e->blocked @@ -42,9 +48,12 @@ /// @warning It's a macro, and it will return the caller function #define RETURN_ACTION_OF_EVENT(event) \ do{ \ - if(EVENT_IMPACT_FLAG(event)==0 && EVENT_BLOCKED(event)==0) return "alert";\ - if(EVENT_IMPACT_FLAG(event)==32 && EVENT_BLOCKED(event)==1) return "drop";\ if(event==NULL && event_type ==0) return "log";\ + else if(EVENT_IMPACT_FLAG(event)==U2_FLAG_ALLOWED && EVENT_BLOCKED(event)==U2_BLOCKED_FLAG_ALLOW) return "alert";\ + else if(EVENT_IMPACT_FLAG(event)==U2_FLAG_BLOCKED && EVENT_BLOCKED(event)==U2_BLOCKED_FLAG_BLOCK) return "drop";\ + else if(EVENT_IMPACT_FLAG(event)==U2_FLAG_ALLOWED && EVENT_BLOCKED(event)==U2_BLOCKED_FLAG_WOULD) return "not dropped";\ + else if(EVENT_IMPACT_FLAG(event)==U2_FLAG_ALLOWED && EVENT_BLOCKED(event)==U2_BLOCKED_FLAG_CANT) return "cant drop";\ + else return NULL;\ }while(0) const char *actionOfEvent(const void * voidevent,uint32_t event_type) @@ -55,22 +64,30 @@ const char *actionOfEvent(const void * voidevent,uint32_t event_type) const Unified2IDSEvent_legacy *event = (const Unified2IDSEvent_legacy *)voidevent; RETURN_ACTION_OF_EVENT(event); } + break; + case UNIFIED2_IDS_EVENT_MPLS: case UNIFIED2_IDS_EVENT_VLAN: { const Unified2IDSEvent *event = (const Unified2IDSEvent *)voidevent; RETURN_ACTION_OF_EVENT(event); } + break; case UNIFIED2_IDS_EVENT_IPV6: { const Unified2IDSEventIPv6_legacy *event = (const Unified2IDSEventIPv6_legacy *)voidevent; RETURN_ACTION_OF_EVENT(event); - - } + } + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: case UNIFIED2_IDS_EVENT_IPV6_VLAN: { const Unified2IDSEventIPv6 *event = (const Unified2IDSEventIPv6 *)voidevent; RETURN_ACTION_OF_EVENT(event); } + break; + default: + LogMessage("WARNING: actionOfEvent(): event_type inconsistent (%d)\n", event_type); + break; }; return NULL; } From 1215ad4e62e10d57c50a78c09239f18e2b737741 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Fri, 10 Apr 2015 10:59:52 +0000 Subject: [PATCH 129/198] spo_alert_json.c modified: getting events from spooler and producing kafka messages with extra data --- src/output-plugins/spo_alert_json.c | 115 +++++++++++++++++++++++++++- src/unified2.h | 18 ++++- 2 files changed, 128 insertions(+), 5 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index acd47bf..71bc010 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -93,8 +93,8 @@ // Note: Always including ,sensor_name,domain_name,group_name,src_net_name,src_as_name,dst_net_name,dst_as_name //#define SEND_NAMES -//#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" //rb:ini +//#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" #define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,file_sha256,file_size,file_hostname,file_uri,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" //rb:fin @@ -858,7 +858,18 @@ char* _itoa(uint64_t value, char* result, int base, size_t bufsize) { /* shortcut to used bases */ static inline char *itoa10(uint64_t value,char *result,const size_t bufsize){return _itoa(value,result,10,bufsize);} +//rb:ini static inline char *itoa16(uint64_t value,char *result,const size_t bufsize){return _itoa(value,result,16,bufsize);} +static inline char *itoa16(uint64_t value,char *result,const size_t bufsize){ + char *ret = _itoa(value,result,16,bufsize); + if(value < 16 && ret > result){ + ret--; + *ret='0'; + } + return ret; +} +//rb:fin + static inline void printHWaddr(KafkaLog *kafka,const uint8_t *addr,char * buf,const size_t bufLen){ int i; for(i=0;i<6;++i){ @@ -1225,6 +1236,103 @@ static char *extract_AS(AlertJSONData *jsonData,const sfip_t *ip) #endif +//rb:ini +static int printElementExtraDataBlob(Packet *p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement, KafkaLog *kafka, + Unified2ExtraData *U2ExtraData) +{ + uint32_t event_info; /* type in Unified2 Event */ + const char *str; + int len; + + event_info = ntohl(U2ExtraData->type); + + switch (templateElement->id) + { + case FILE_SHA256: + if (event_info == EVENT_INFO_FILE_SHA256) + { + const uint8_t *sha_str = (uint8_t *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + + uint16_t i; + char buf[sizeof "00"]; + const size_t bufLen = sizeof buf; + if(sha_str && len>0) + for(i=0; idefaultValue); + } + break; + case FILE_SIZE: + if (event_info == EVENT_INFO_FILE_SIZE) + { + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + KafkaLog_Write(kafka, str, len); + } + break; + case FILE_URI: + if (event_info == EVENT_INFO_FILE_URI) + { + + } + break; + case FILE_HOSTNAME: + if (event_info == EVENT_INFO_FILE_HOSTNAME) + { + + } + break; + default: + LogMessage("WARNING: printElementExtraDataBlob(): JSON Element ID inconsistent (%d)\n", templateElement->id); + break; + } + + return 0; +} + +static int printElementExtraData(Packet *p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement, KafkaLog *kafka) +{ + uint32_t event_data_type; /* datatype in Unified2 Event*/ + ExtraDataRecordNode *edrnCurrent = NULL; + Unified2ExtraData *U2ExtraData; + ExtraDataRecordCache *extra_data_cache; + + switch (event_type) + { + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + extra_data_cache = &(((Unified2IDSEvent_WithPED *)(event))->extra_data_cache); + break; + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + extra_data_cache = &(((Unified2IDSEventIPv6_WithPED *)(event))->extra_data_cache); + break; + default: + extra_data_cache = NULL; + LogMessage("WARNING: printElementExtraData(): event_type inconsistent (%d)\n", event_type); + break; + } + + if (extra_data_cache == NULL) + return 0; + + TAILQ_FOREACH(edrnCurrent, extra_data_cache, entry) + { + U2ExtraData = (Unified2ExtraData *)(((Unified2ExtraDataHdr *)edrnCurrent->data)+1); + event_data_type = ntohl(U2ExtraData->data_type); + + printf ("\n"); + if (event_data_type == EVENT_DATA_TYPE_BLOB) + printElementExtraDataBlob(p, event, event_type, jsonData, templateElement, kafka, U2ExtraData); + } + + return 0; +} +//rb:fin /* * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) @@ -1370,12 +1478,11 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, break; //rb:ini case FILE_SHA256: - break; case FILE_SIZE: - break; case FILE_URI: - break; case FILE_HOSTNAME: + if (event != NULL) + printElementExtraData(p, event, event_type, jsonData, templateElement, kafka); break; //rb:fin case PAYLOAD: diff --git a/src/unified2.h b/src/unified2.h index ee0d710..96943c3 100644 --- a/src/unified2.h +++ b/src/unified2.h @@ -174,7 +174,23 @@ typedef enum _EventInfoEnum EVENT_INFO_XFF_IPV4 = 1, EVENT_INFO_XFF_IPV6 , EVENT_INFO_REVIEWED_BY, - EVENT_INFO_GZIP_DATA +//rb:ini + //EVENT_INFO_GZIP_DATA + EVENT_INFO_GZIP_DATA, + EVENT_INFO_SMTP_FILENAME, + EVENT_INFO_SMTP_MAILFROM, + EVENT_INFO_SMTP_RCPTTO, + EVENT_INFO_SMTP_EMAIL_HDRS, + EVENT_INFO_HTTP_URI, + EVENT_INFO_HTTP_HOSTNAME, + EVENT_INFO_IPV6_SRC, + EVENT_INFO_IPV6_DST, + EVENT_INFO_JSNORM_DATA, + EVENT_INFO_FILE_SHA256, + EVENT_INFO_FILE_SIZE, + EVENT_INFO_FILE_URI, + EVENT_INFO_FILE_HOSTNAME +//rb:fin }EventInfoEnum; typedef enum _EventDataType From fc3035bc47d96be335f793f0a9e75239f84effb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 10 Apr 2015 11:02:38 +0000 Subject: [PATCH 130/198] Not sending src/dst net/name if they are empty --- src/output-plugins/spo_alert_json.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index d7198b9..796a2b6 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1581,15 +1581,17 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case SRC_NET: case DST_NET: { - Number_str_assoc * ip_net = SearchIpStr(ip,jsonData->nets,NETWORKS); - KafkaLog_Puts(kafka,ip_net?ip_net->number_as_str:templateElement->defaultValue); + Number_str_assoc *ip_net = SearchIpStr(ip,jsonData->nets,NETWORKS); + if(ip_net) + KafkaLog_Puts(kafka,ip_net->number_as_str); } break; case SRC_NET_NAME: case DST_NET_NAME: { - Number_str_assoc * ip_net = SearchIpStr(ip,jsonData->nets,NETWORKS); - KafkaLog_Puts(kafka,ip_net?ip_net->human_readable_str:templateElement->defaultValue); + Number_str_assoc *ip_net = SearchIpStr(ip,jsonData->nets,NETWORKS); + if(ip_net) + KafkaLog_Puts(kafka,ip_net->human_readable_str); } break; From e25213d4a784ab6c2281b7ebfb3d762993be2d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 10 Apr 2015 11:04:00 +0000 Subject: [PATCH 131/198] Changed alert messages to should_drop and cant_drop --- src/rbutil/rb_unified2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rbutil/rb_unified2.c b/src/rbutil/rb_unified2.c index 934e450..5923efe 100644 --- a/src/rbutil/rb_unified2.c +++ b/src/rbutil/rb_unified2.c @@ -51,8 +51,8 @@ if(event==NULL && event_type ==0) return "log";\ else if(EVENT_IMPACT_FLAG(event)==U2_FLAG_ALLOWED && EVENT_BLOCKED(event)==U2_BLOCKED_FLAG_ALLOW) return "alert";\ else if(EVENT_IMPACT_FLAG(event)==U2_FLAG_BLOCKED && EVENT_BLOCKED(event)==U2_BLOCKED_FLAG_BLOCK) return "drop";\ - else if(EVENT_IMPACT_FLAG(event)==U2_FLAG_ALLOWED && EVENT_BLOCKED(event)==U2_BLOCKED_FLAG_WOULD) return "not dropped";\ - else if(EVENT_IMPACT_FLAG(event)==U2_FLAG_ALLOWED && EVENT_BLOCKED(event)==U2_BLOCKED_FLAG_CANT) return "cant drop";\ + else if(EVENT_IMPACT_FLAG(event)==U2_FLAG_ALLOWED && EVENT_BLOCKED(event)==U2_BLOCKED_FLAG_WOULD) return "should_drop";\ + else if(EVENT_IMPACT_FLAG(event)==U2_FLAG_ALLOWED && EVENT_BLOCKED(event)==U2_BLOCKED_FLAG_CANT) return "cant_drop";\ else return NULL;\ }while(0) From a1b3487305db71a135ab627f1be3a824c388939d Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Tue, 14 Apr 2015 07:47:37 +0000 Subject: [PATCH 132/198] Solving memory issues --- src/input-plugins/spi_unified2.c | 83 +++++++++- src/spooler.c | 260 +++++++++++++++++++++---------- 2 files changed, 257 insertions(+), 86 deletions(-) diff --git a/src/input-plugins/spi_unified2.c b/src/input-plugins/spi_unified2.c index 372f20d..17555d3 100644 --- a/src/input-plugins/spi_unified2.c +++ b/src/input-plugins/spi_unified2.c @@ -160,6 +160,80 @@ int Unified2ReadRecordHeader(void *sph) return 0; } +//rb:ini +unsigned long GetSizeofByType(uint32_t type, uint32_t length) +{ + unsigned long ret = 0; + + switch (type) + { + case UNIFIED2_IDS_EVENT: + ret = sizeof(Unified2IDSEvent_legacy_WithPED); + break; + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + ret = sizeof(Unified2IDSEvent_WithPED); + break; + case UNIFIED2_IDS_EVENT_IPV6: + ret = sizeof(Unified2IDSEventIPv6_legacy_WithPED); + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + ret = sizeof(Unified2IDSEventIPv6_WithPED); + break; + case UNIFIED2_PACKET: + case UNIFIED2_EXTRA_DATA: + ret = length; + break; + default: + LogMessage("WARNING: GetSizeofByType(): type inconsistent (%d)\n", type); + break; + } + + if (ret == 0) + FatalError("GetSizeofByType(): sizeof = 0 bytes!\n"); + + return ret; +} + +void InitPEDByType(void *data, uint32_t type) +{ + if (data == NULL) + { + LogMessage("WARNING: InitDataByType(): data is NULL\n"); + return; + } + + switch (type) + { + case UNIFIED2_IDS_EVENT: + ((Unified2IDSEvent_legacy_WithPED *)data)->packet = NULL; + TAILQ_INIT(&(((Unified2IDSEvent_legacy_WithPED *)data)->extra_data_cache)); + break; + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + ((Unified2IDSEvent_WithPED *)data)->packet = NULL; + TAILQ_INIT(&(((Unified2IDSEvent_WithPED *)data)->extra_data_cache)); + break; + case UNIFIED2_IDS_EVENT_IPV6: + ((Unified2IDSEventIPv6_legacy_WithPED *)data)->packet = NULL; + TAILQ_INIT(&(((Unified2IDSEventIPv6_legacy_WithPED *)data)->extra_data_cache)); + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + ((Unified2IDSEventIPv6_WithPED *)data)->packet = NULL; + TAILQ_INIT(&(((Unified2IDSEventIPv6_WithPED *)data)->extra_data_cache)); + break; + case UNIFIED2_PACKET: + case UNIFIED2_EXTRA_DATA: + break; + default: + LogMessage("WARNING: InitDataByType(): type inconsistent (%d)\n", type); + break; + } +} +//rb:fin + int Unified2ReadRecord(void *sph) { ssize_t bytes_read; @@ -179,14 +253,9 @@ int Unified2ReadRecord(void *sph) /* SnortAlloc will FatalError if memory can't be assigned */ //rb:ini #ifdef rbtest_spi_unified2 - spooler->record.data = SnortAlloc(record_length+sizeof(void *)+sizeof(ExtraDataRecordCache)/*+sizeof(uint32_t)*/); - - /* Habría que poner a NULL el puntero a paquete (...WithEDP->pkt) */ - //(((char *)(spooler->record.data))+record_length) = NULL; - //((Unified2IDSEvent_WithPED *)ernNode->data)->packet = NULL; + spooler->record.data = SnortAlloc(GetSizeofByType(record_type, record_length)); - TAILQ_INIT((ExtraDataRecordCache *)(((char *)(spooler->record.data))+record_length)+sizeof(void *)); - //*(&(spooler->record.data)+record_length+sizeof(ExtraDataRecordCache)) = NULL; + InitPEDByType(spooler->record.data, record_type); #else spooler->record.data = SnortAlloc(record_length); #endif diff --git a/src/spooler.c b/src/spooler.c index 91bb558..ac73ff4 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -50,6 +50,9 @@ static Spooler *spoolerOpen(const char *, const char *, uint32_t); int spoolerClose(Spooler *); static int spoolerReadRecordHeader(Spooler *); static int spoolerReadRecord(Spooler *); +//rb:ini +static Packet * spoolerAllocateFirstPacket(Spooler *); +//rb:fin static void spoolerProcessRecord(Spooler *, int); static void spoolerFreeRecord(Record *record); @@ -67,6 +70,9 @@ static int spoolerCallOutputPluginsByERN (EventRecordNode *); static EventRecordNode * spoolerEventCacheGetByEventID(Spooler *, uint32_t); static EventRecordNode * spoolerEventCacheGetHead(Spooler *); static uint8_t spoolerEventCacheHeadUsed(Spooler *); +//rb:ini +static int spoolerExtraDataCacheClean(EventRecordNode *ern); +//rb:fin static int spoolerEventCacheClean(Spooler *); /* Find the next spool file timestamp extension with a value equal to or @@ -703,6 +709,41 @@ int ProcessContinuousWithWaldo(Waldo *waldo) waldo->data.record_idx, waldo->data.timestamp); } +//rb:ini +static Packet * spoolerAllocateFirstPacket(Spooler *spooler) +{ + struct pcap_pkthdr pkth; + Packet *packet = NULL; + + /* allocate space for the packet and construct the packet header */ + packet = SnortAlloc(sizeof(Packet)); + + pkth.caplen = ntohl(((Unified2Packet *)spooler->record.data)->packet_length); + pkth.len = pkth.caplen; + pkth.ts.tv_sec = ntohl(((Unified2Packet *)spooler->record.data)->packet_second); + pkth.ts.tv_usec = ntohl(((Unified2Packet *)spooler->record.data)->packet_microsecond); + + /* decode the packet from the Unified2Packet information */ + datalink = ntohl(((Unified2Packet *)spooler->record.data)->linktype); + DecodePacket(datalink, packet, &pkth, + ((Unified2Packet *)spooler->record.data)->packet_data); + + /* This is a fixup for portscan... */ + if( (packet->iph == NULL) && + ((packet->inner_iph != NULL) && (packet->inner_iph->ip_proto == 255))) + { + packet->iph = packet->inner_iph; + } + + /* check if it's been re-assembled */ + if (packet->packet_flags & PKT_REBUILT_STREAM) + { + DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Packet has been rebuilt from a stream\n");); + } + + return packet; +} +//rb:fin /* ** RECORD PROCESSING EVENTS @@ -710,7 +751,11 @@ int ProcessContinuousWithWaldo(Waldo *waldo) static void spoolerProcessRecord(Spooler *spooler, int fire_output) { +//rb:ini +#ifndef rbtest_spooler struct pcap_pkthdr pkth; +#endif +//rb:fin uint32_t type; EventRecordNode *ernCache; @@ -750,34 +795,10 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) /* check if there is a previously cached event that matches this event id */ ernCache = spoolerEventCacheGetByEventID(spooler, event_id); - /* allocate space for the packet and construct the packet header */ - spooler->record.pkt = SnortAlloc(sizeof(Packet)); - - pkth.caplen = ntohl(((Unified2Packet *)spooler->record.data)->packet_length); - pkth.len = pkth.caplen; - pkth.ts.tv_sec = ntohl(((Unified2Packet *)spooler->record.data)->packet_second); - pkth.ts.tv_usec = ntohl(((Unified2Packet *)spooler->record.data)->packet_microsecond); - - /* decode the packet from the Unified2Packet information */ - datalink = ntohl(((Unified2Packet *)spooler->record.data)->linktype); - DecodePacket(datalink, spooler->record.pkt, &pkth, - ((Unified2Packet *)spooler->record.data)->packet_data); - - /* This is a fixup for portscan... */ - if( (spooler->record.pkt->iph == NULL) && - ((spooler->record.pkt->inner_iph != NULL) && (spooler->record.pkt->inner_iph->ip_proto == 255))) - { - spooler->record.pkt->iph = spooler->record.pkt->inner_iph; - } - - /* check if it's been re-assembled */ - if (spooler->record.pkt->packet_flags & PKT_REBUILT_STREAM) - { - DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Packet has been rebuilt from a stream\n");); - } - //rb:ini #ifdef rbtest_spooler + datalink = ntohl(((Unified2Packet *)spooler->record.data)->linktype); + /* if the packet and cached event share the same id */ if (ernCache != NULL) { @@ -785,21 +806,34 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) switch (ernCache->type) { case UNIFIED2_IDS_EVENT: + /* if there is no previous packet */ + if (((Unified2IDSEvent_legacy_WithPED *)ernCache->data)->packet == NULL) + ((Unified2IDSEvent_legacy_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); + /* when != NULL there is a previous packet cached with the event. do nothing here. */ + break; case UNIFIED2_IDS_EVENT_MPLS: case UNIFIED2_IDS_EVENT_VLAN: /* if there is no previous packet */ if (((Unified2IDSEvent_WithPED *)ernCache->data)->packet == NULL) - ((Unified2IDSEvent_WithPED *)ernCache->data)->packet = spooler->record.pkt; + ((Unified2IDSEvent_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); /* when != NULL there is a previous packet cached with the event. do nothing here. */ break; case UNIFIED2_IDS_EVENT_IPV6: + /* if there is no previous packet */ + if (((Unified2IDSEventIPv6_legacy_WithPED *)ernCache->data)->packet == NULL) + ((Unified2IDSEventIPv6_legacy_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); + /* when != NULL there is a previous packet cached with the event. do nothing here. */ + break; case UNIFIED2_IDS_EVENT_IPV6_MPLS: case UNIFIED2_IDS_EVENT_IPV6_VLAN: /* if there is no previous packet */ if (((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet == NULL) - ((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet = spooler->record.pkt; + ((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); /* when != NULL there is a previous packet cached with the event. do nothing here. */ break; + default: + LogMessage("WARNING: spoolerProcessRecord(): type inconsistent (%d)\n", ernCache->type); + break; } } //else @@ -808,6 +842,32 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) // This hypothetical case should be taken into account after testings //} #else + /* allocate space for the packet and construct the packet header */ + spooler->record.pkt = SnortAlloc(sizeof(Packet)); + + pkth.caplen = ntohl(((Unified2Packet *)spooler->record.data)->packet_length); + pkth.len = pkth.caplen; + pkth.ts.tv_sec = ntohl(((Unified2Packet *)spooler->record.data)->packet_second); + pkth.ts.tv_usec = ntohl(((Unified2Packet *)spooler->record.data)->packet_microsecond); + + /* decode the packet from the Unified2Packet information */ + datalink = ntohl(((Unified2Packet *)spooler->record.data)->linktype); + DecodePacket(datalink, spooler->record.pkt, &pkth, + ((Unified2Packet *)spooler->record.data)->packet_data); + + /* This is a fixup for portscan... */ + if( (spooler->record.pkt->iph == NULL) && + ((spooler->record.pkt->inner_iph != NULL) && (spooler->record.pkt->inner_iph->ip_proto == 255))) + { + spooler->record.pkt->iph = spooler->record.pkt->inner_iph; + } + + /* check if it's been re-assembled */ + if (spooler->record.pkt->packet_flags & PKT_REBUILT_STREAM) + { + DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Packet has been rebuilt from a stream\n");); + } + /* if the packet and cached event share the same id */ if ( ernCache != NULL ) { @@ -917,7 +977,7 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) if ( ernCache != NULL ) { /* include extra data record */ - spoolerExtraDataCachePush(spooler, type, /*((Unified2ExtraDataHdr *)spooler->record.data)+1*/spooler->record.data, ernCache); + spoolerExtraDataCachePush(spooler, type, spooler->record.data, ernCache); spooler->record.data = NULL; } //else @@ -1166,6 +1226,74 @@ static uint8_t spoolerEventCacheHeadUsed(Spooler *spooler) (elm) = (tmpelm)) #endif +//rb:ini +static int spoolerExtraDataCacheClean(EventRecordNode *ern) +{ + ExtraDataRecordNode *edrn_next = NULL; + ExtraDataRecordNode *edrn = NULL; + ExtraDataRecordCache *edrc = NULL; + void *packet; + + if (ern == NULL) + { + LogMessage("WARNING: spoolerExtraDataCacheClean(): ern is NULL\n"); + return 1; + } + + switch (ern->type) + { + case UNIFIED2_IDS_EVENT: + edrc = &(((Unified2IDSEvent_legacy_WithPED *)(ern->data)))->extra_data_cache; + packet = (((Unified2IDSEvent_legacy_WithPED *)(ern->data))->packet); + break; + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + edrc = &(((Unified2IDSEvent_WithPED *)(ern->data)))->extra_data_cache; + packet = ((Unified2IDSEvent_WithPED *)(ern->data))->packet; + break; + case UNIFIED2_IDS_EVENT_IPV6: + edrc = &(((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data)))->extra_data_cache; + packet = ((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data))->packet; + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + edrc = &(((Unified2IDSEventIPv6_WithPED *)(ern->data)))->extra_data_cache; + packet = ((Unified2IDSEventIPv6_WithPED *)(ern->data))->packet; + break; + case UNIFIED2_PACKET: + case UNIFIED2_EXTRA_DATA: + break; + default: + LogMessage("WARNING: spoolerExtraDataCacheClean(): type inconsistent (%d)\n", ern->type); + break; + } + + if (packet) + { + free(packet); + packet = NULL; + } + + if (edrc == NULL || TAILQ_EMPTY(edrc)) + return 1; + + TAILQ_FOREACH_SAFE(edrn, edrn_next, edrc, entry) + { + TAILQ_REMOVE(edrc, edrn, entry); + + if (edrn && edrn->data) + { + free(edrn->data); + edrn->data = NULL; + } + if (edrn) + free(edrn); + } + + return 0; +} +//rb:fin + static int spoolerEventCacheClean(Spooler *spooler) { EventRecordNode *ernCurrent = NULL; @@ -1177,54 +1305,25 @@ static int spoolerEventCacheClean(Spooler *spooler) ernCurrent = TAILQ_LAST(&spooler->event_cache,_EventRecordList); while (ernCurrent != NULL && spooler->events_cached > barnyard2_conf->event_cache_size ) { - ernPrev = TAILQ_PREV(ernCurrent, _EventRecordList, entry); - if ( ernCurrent->used == 1 ) + ernPrev = TAILQ_PREV(ernCurrent, _EventRecordList, entry); + if ( ernCurrent->used == 1 ) { - /* Delete from list */ - TAILQ_REMOVE(&spooler->event_cache, ernCurrent, entry); - + /* Delete from list */ + TAILQ_REMOVE(&spooler->event_cache, ernCurrent, entry); spooler->events_cached--; - if(ernCurrent->data != NULL) - { -//rb:ini (Liberar memoria (TAILQ_REMOVE). Hay que ver si se hace aquí) -#ifdef AAOSOFOSO -//#ifdef rbtest_spi_unified2 - switch (ernCurrent->type) + if(ernCurrent->data != NULL) { - case UNIFIED2_IDS_EVENT: - case UNIFIED2_IDS_EVENT_MPLS: - case UNIFIED2_IDS_EVENT_VLAN: - /* if there is no previous packet */ - if (((Unified2IDSEvent_WithPED *)ernCache->data)->packet == NULL) - //((Unified2IDSEvent_WithPED *)ernCache->data)->packet = spooler->record.pkt; - TAILQ_INIT((Unified2IDSEvent_WithPED *)ernCurrent->data)->extra_data_cache)); - /* when != NULL there is a previous packet cached with the event. do nothing here. */ - break; - case UNIFIED2_IDS_EVENT_IPV6: - case UNIFIED2_IDS_EVENT_IPV6_MPLS: - case UNIFIED2_IDS_EVENT_IPV6_VLAN: - /* if there is no previous packet */ - if (((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet == NULL) - //((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet = spooler->record.pkt; - TAILQ_INIT((ExtraDataRecordCache *)(((char *)(spooler->record.data))+record_length)+sizeof(void *)); - /* when != NULL there is a previous packet cached with the event. do nothing here. */ - break; - } - //TAILQ_INIT((ExtraDataRecordCache *)(((char *)(spooler->record.data))+record_length)+sizeof(void *)); -#endif +//rb:ini + spoolerExtraDataCacheClean(ernCurrent); //rb:fin - free(ernCurrent->data); - } - - if(ernCurrent != NULL) - { - free(ernCurrent); - } - } - - ernCurrent = ernPrev; + free(ernCurrent->data); + } + if(ernCurrent != NULL) + free(ernCurrent); + } + ernCurrent = ernPrev; } return 0; @@ -1242,15 +1341,18 @@ void spoolerEventCacheFlush(Spooler *spooler) { TAILQ_REMOVE(&spooler->event_cache,evt_ptr,entry); - if(evt_ptr->data) - { - free(evt_ptr->data); - evt_ptr->data = NULL; - } - - free(evt_ptr); + if(evt_ptr->data) + { +//rb:ini + spoolerExtraDataCacheClean(evt_ptr); +//rb:fin + free(evt_ptr->data); + evt_ptr->data = NULL; + } + + free(evt_ptr); } - + return; } From 10a40c1f9eeca3b2a97cb76fb701fd07cef8a50a Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Tue, 14 Apr 2015 08:47:02 +0000 Subject: [PATCH 133/198] Fixing/readjusting some pieces of code --- src/output-plugins/spo_alert_json.c | 14 +++++----- src/spooler.c | 41 +++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 7f95aff..a3c5afd 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1237,8 +1237,7 @@ static char *extract_AS(AlertJSONData *jsonData,const sfip_t *ip) #endif //rb:ini -static int printElementExtraDataBlob(Packet *p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement, KafkaLog *kafka, - Unified2ExtraData *U2ExtraData) +static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, KafkaLog *kafka, Unified2ExtraData *U2ExtraData) { uint32_t event_info; /* type in Unified2 Event */ const char *str; @@ -1292,7 +1291,7 @@ static int printElementExtraDataBlob(Packet *p, void *event, uint32_t event_type return 0; } -static int printElementExtraData(Packet *p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement, KafkaLog *kafka) +static int printElementExtraData(void *event, uint32_t event_type, AlertJSONTemplateElement *templateElement, KafkaLog *kafka) { uint32_t event_data_type; /* datatype in Unified2 Event*/ ExtraDataRecordNode *edrnCurrent = NULL; @@ -1302,11 +1301,15 @@ static int printElementExtraData(Packet *p, void *event, uint32_t event_type, Al switch (event_type) { case UNIFIED2_IDS_EVENT: + extra_data_cache = &(((Unified2IDSEvent_legacy_WithPED *)(event))->extra_data_cache); + break; case UNIFIED2_IDS_EVENT_MPLS: case UNIFIED2_IDS_EVENT_VLAN: extra_data_cache = &(((Unified2IDSEvent_WithPED *)(event))->extra_data_cache); break; case UNIFIED2_IDS_EVENT_IPV6: + extra_data_cache = &(((Unified2IDSEventIPv6_legacy_WithPED *)(event))->extra_data_cache); + break; case UNIFIED2_IDS_EVENT_IPV6_MPLS: case UNIFIED2_IDS_EVENT_IPV6_VLAN: extra_data_cache = &(((Unified2IDSEventIPv6_WithPED *)(event))->extra_data_cache); @@ -1325,9 +1328,8 @@ static int printElementExtraData(Packet *p, void *event, uint32_t event_type, Al U2ExtraData = (Unified2ExtraData *)(((Unified2ExtraDataHdr *)edrnCurrent->data)+1); event_data_type = ntohl(U2ExtraData->data_type); - printf ("\n"); if (event_data_type == EVENT_DATA_TYPE_BLOB) - printElementExtraDataBlob(p, event, event_type, jsonData, templateElement, kafka, U2ExtraData); + printElementExtraDataBlob(templateElement, kafka, U2ExtraData); } return 0; @@ -1482,7 +1484,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case FILE_URI: case FILE_HOSTNAME: if (event != NULL) - printElementExtraData(p, event, event_type, jsonData, templateElement, kafka); + printElementExtraData(event, event_type, templateElement, kafka); break; //rb:fin case PAYLOAD: diff --git a/src/spooler.c b/src/spooler.c index ac73ff4..ccea942 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -1109,6 +1109,9 @@ static EventRecordNode *spoolerEventCacheGetBySpooler(Spooler *spooler) case UNIFIED2_EXTRA_DATA: event_id = ntohl(((Unified2ExtraData *)(((Unified2ExtraDataHdr *)spooler->record.data)+1))->event_id); break; + default: + LogMessage("WARNING: spoolerEventCacheGetBySpooler(): type inconsistent (%d)\n", type); + break; } /* check if there is a previously cached event that matches this event id */ @@ -1143,6 +1146,22 @@ static int spoolerCallOutputPluginsByERN(EventRecordNode *ern) switch (ern->type) { case UNIFIED2_IDS_EVENT: + /* if there is a cached packet */ + if (((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet != NULL) + { + CallOutputPlugins(OUTPUT_TYPE__SPECIAL, + ((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet, + ern->data, + ern->type); + free(((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet); + ((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet = NULL; + } + else + CallOutputPlugins(OUTPUT_TYPE__ALERT, + NULL, + ern->data, + ern->type); + break; case UNIFIED2_IDS_EVENT_MPLS: case UNIFIED2_IDS_EVENT_VLAN: /* if there is a cached packet */ @@ -1162,6 +1181,22 @@ static int spoolerCallOutputPluginsByERN(EventRecordNode *ern) ern->type); break; case UNIFIED2_IDS_EVENT_IPV6: + /* if there is a cached packet */ + if (((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet != NULL) + { + CallOutputPlugins(OUTPUT_TYPE__SPECIAL, + ((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet, + ern->data, + ern->type); + free(((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet); + ((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet = NULL; + } + else + CallOutputPlugins(OUTPUT_TYPE__ALERT, + NULL, + ern->data, + ern->type); + break; case UNIFIED2_IDS_EVENT_IPV6_MPLS: case UNIFIED2_IDS_EVENT_IPV6_VLAN: /* if there is a cached packet */ @@ -1180,6 +1215,9 @@ static int spoolerCallOutputPluginsByERN(EventRecordNode *ern) ern->data, ern->type); break; + default: + LogMessage("WARNING: spoolerCallOutputPluginsByERN(): type inconsistent (%d)\n", ern->type); + break; } ret = 1; } @@ -1287,7 +1325,10 @@ static int spoolerExtraDataCacheClean(EventRecordNode *ern) edrn->data = NULL; } if (edrn) + { free(edrn); + edrn = NULL; + } } return 0; From f45af1e8f902b0fd6360ddb8259f5199c5fcbc69 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Tue, 14 Apr 2015 10:58:17 +0000 Subject: [PATCH 134/198] Comment added to explain payload not matching --- src/output-plugins/spo_alert_json.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 796a2b6..32901ff 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1355,6 +1355,10 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, break; case PAYLOAD: { + /* Sending packet payload (Packet->data) inside kafka message, instead of + raw packet data (Packet->pkt). See Packet structure in decode.h file. + Please take into account that snort.log. files contains + the raw packet data, not packet payload, so they won't match. */ uint16_t i; if(p && p->dsize>0){ for(i=0;idsize;++i) From 57cf6a7966ff41c9b6d537d216a9b4a42f6f2c30 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Tue, 14 Apr 2015 16:50:05 +0000 Subject: [PATCH 135/198] Firing the last cached event --- src/barnyard2.h | 2 +- src/spooler.c | 644 +++++++++++++++++++++++------------------------- 2 files changed, 305 insertions(+), 341 deletions(-) diff --git a/src/barnyard2.h b/src/barnyard2.h index 6345604..601e4d9 100644 --- a/src/barnyard2.h +++ b/src/barnyard2.h @@ -147,7 +147,7 @@ #endif //rb:ini -#define TIME_ALARM 2 // seconds to flush the last cached event +#define TIME_ALARM 1 // seconds to flush the last cached event //rb:fin /* D A T A S T R U C T U R E S *********************************************/ diff --git a/src/spooler.c b/src/spooler.c index ccea942..56ba218 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -50,9 +50,6 @@ static Spooler *spoolerOpen(const char *, const char *, uint32_t); int spoolerClose(Spooler *); static int spoolerReadRecordHeader(Spooler *); static int spoolerReadRecord(Spooler *); -//rb:ini -static Packet * spoolerAllocateFirstPacket(Spooler *); -//rb:fin static void spoolerProcessRecord(Spooler *, int); static void spoolerFreeRecord(Record *record); @@ -61,19 +58,18 @@ static int spoolerOpenWaldo(Waldo *, uint8_t); int spoolerCloseWaldo(Waldo *); static int spoolerEventCachePush(Spooler *, uint32_t, void *); -//rb:ini -static int spoolerExtraDataCachePush(Spooler *, uint32_t, void *, EventRecordNode *); -static EventRecordNode * spoolerEventCacheGetBySpooler(Spooler *); -static int spoolerFireLastEvent(Spooler *); -static int spoolerCallOutputPluginsByERN (EventRecordNode *); -//rb:fin static EventRecordNode * spoolerEventCacheGetByEventID(Spooler *, uint32_t); static EventRecordNode * spoolerEventCacheGetHead(Spooler *); static uint8_t spoolerEventCacheHeadUsed(Spooler *); +static int spoolerEventCacheClean(Spooler *); + //rb:ini +static Packet * spoolerAllocateFirstPacket(Spooler *); +static int spoolerExtraDataCachePush(Spooler *, uint32_t, void *, EventRecordNode *); +static void spoolerFireLastEvent(Spooler *); +static int spoolerCallOutputPluginsByERN (EventRecordNode *); static int spoolerExtraDataCacheClean(EventRecordNode *ern); //rb:fin -static int spoolerEventCacheClean(Spooler *); /* Find the next spool file timestamp extension with a value equal to or * greater than timet. If extension != NULL, the extension will be @@ -234,15 +230,6 @@ int spoolerClose(Spooler *spooler) if (spooler == NULL) return -1; -//rb:ini - if (spoolerFireLastEvent(spooler)) - LogMessage("Last cached event from spool file '%s' fired\n", - spooler->filepath); - else - LogMessage("Last cached event from spool file '%s' couldn't be fired\n", - spooler->filepath); -//rb:fin - LogMessage("Closing spool file '%s'. Read %d records\n", spooler->filepath, spooler->record_idx); @@ -477,17 +464,8 @@ int ProcessContinuous(const char *dirpath, const char *filebase, /* Start the main process loop */ while (exit_signal == 0) { -//rb:ini - if (AlarmCheck()) - { - //if(cache not empty) - //flush cache - AlarmClear(); - } -//rb:fin - - /* for SIGUSR1 / dropstats */ - SignalCheck(); + /* for SIGUSR1 / dropstats */ + SignalCheck(); /* no spooler exists so let's create one */ if (spooler == NULL) @@ -495,7 +473,7 @@ int ProcessContinuous(const char *dirpath, const char *filebase, /* find the next file to spool */ ret = FindNextExtension(dirpath, filebase, timestamp, &extension); - /* The file found is not the same as specified in the waldo, + /* The file found is not the same as specified in the waldo, thus we need to reset record_start, since we are obviously not processing the same file*/ if(waldo_timestamp != extension) { @@ -528,32 +506,39 @@ int ProcessContinuous(const char *dirpath, const char *filebase, pc_ret = -1; continue; } - + /* found a new extension so create a new spooler */ if ( (spooler=spoolerOpen(dirpath, filebase, extension)) == NULL ) { LogMessage("ERROR: Unable to create spooler!\n"); exit_signal = -1; pc_ret = -1; - continue; + continue; + } + else + { + /* Make sure we create a new waldo even if we did not have processed an event */ + if(waldo_timestamp != extension) + { + spooler->record_idx = 0; + spoolerWriteWaldo(&barnyard2_conf->waldo, spooler); + } + waiting_logged = 0; + + /* set timestamp to ensure we look for a newer file next time */ + timestamp = extension + 1; } - else - { - /* Make sure we create a new waldo even if we did not have processed an event */ - if(waldo_timestamp != extension) - { - spooler->record_idx = 0; - spoolerWriteWaldo(&barnyard2_conf->waldo, spooler); - } - waiting_logged = 0; - - /* set timestamp to ensure we look for a newer file next time */ - timestamp = extension + 1; - } - + continue; } - +//rb:ini + if (AlarmCheck()) + { + spoolerFireLastEvent(spooler); + AlarmClear(); + } + else +//rb:fin /* act according to current spooler state */ switch(spooler->state) { @@ -577,7 +562,7 @@ int ProcessContinuous(const char *dirpath, const char *filebase, #endif /* we've finished with the spooler so destroy and cleanup */ - UnRegisterSpooler(spooler); + UnRegisterSpooler(spooler); spoolerClose(spooler); spooler = NULL; @@ -654,7 +639,7 @@ int ProcessContinuous(const char *dirpath, const char *filebase, ArchiveFile(spooler->filepath, BcArchiveDir()); /* close (ie. destroy and cleanup) the spooler so we can rotate */ - UnRegisterSpooler(spooler); + UnRegisterSpooler(spooler); spoolerClose(spooler); spooler = NULL; @@ -695,7 +680,7 @@ int ProcessContinuous(const char *dirpath, const char *filebase, /* close waldo if appropriate */ if(barnyard2_conf) - spoolerCloseWaldo(&barnyard2_conf->waldo); + spoolerCloseWaldo(&barnyard2_conf->waldo); return pc_ret; } @@ -709,42 +694,6 @@ int ProcessContinuousWithWaldo(Waldo *waldo) waldo->data.record_idx, waldo->data.timestamp); } -//rb:ini -static Packet * spoolerAllocateFirstPacket(Spooler *spooler) -{ - struct pcap_pkthdr pkth; - Packet *packet = NULL; - - /* allocate space for the packet and construct the packet header */ - packet = SnortAlloc(sizeof(Packet)); - - pkth.caplen = ntohl(((Unified2Packet *)spooler->record.data)->packet_length); - pkth.len = pkth.caplen; - pkth.ts.tv_sec = ntohl(((Unified2Packet *)spooler->record.data)->packet_second); - pkth.ts.tv_usec = ntohl(((Unified2Packet *)spooler->record.data)->packet_microsecond); - - /* decode the packet from the Unified2Packet information */ - datalink = ntohl(((Unified2Packet *)spooler->record.data)->linktype); - DecodePacket(datalink, packet, &pkth, - ((Unified2Packet *)spooler->record.data)->packet_data); - - /* This is a fixup for portscan... */ - if( (packet->iph == NULL) && - ((packet->inner_iph != NULL) && (packet->inner_iph->ip_proto == 255))) - { - packet->iph = packet->inner_iph; - } - - /* check if it's been re-assembled */ - if (packet->packet_flags & PKT_REBUILT_STREAM) - { - DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Packet has been rebuilt from a stream\n");); - } - - return packet; -} -//rb:fin - /* ** RECORD PROCESSING EVENTS */ @@ -1051,180 +1000,6 @@ static int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) return 0; } -//rb:ini (En TAILQ_INSERT_HEAD hay que distinguir entre IPv4 e IPv6) -static int spoolerExtraDataCachePush(Spooler *spooler, uint32_t type, void *data, EventRecordNode *ernNode) -{ - ExtraDataRecordNode *edrnNode; - - DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Including extra data with cached event %lu\n",ntohl(((Unified2EventCommon *)data)->event_id));); - - /* allocate memory */ - edrnNode = (ExtraDataRecordNode *)SnortAlloc(sizeof(ExtraDataRecordNode)); - - /* create the new node */ - edrnNode->used = 0; - edrnNode->type = type; - edrnNode->data = data; - - /* add new extra data to the front of the cache */ - TAILQ_INSERT_HEAD((ExtraDataRecordCache *)&((Unified2IDSEvent_WithPED *)(ernNode->data))->extra_data_cache, edrnNode, entry); - //((Unified2IDSEvent_WithExtra *)data)->extra_data_cached++; - - //DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Cached extra data record: %d\n", ((Unified2IDSEvent_WithExtra *)data)->extra_data_cached);); - - return 0; -} - -/* Fire the last cached event if it exists */ -static EventRecordNode *spoolerEventCacheGetBySpooler(Spooler *spooler) -{ - uint32_t event_id; - uint32_t type; - EventRecordNode *ernCache; - - if (spooler == NULL) - return NULL; - - if (spooler->record.header == NULL) - return NULL; - - if (spooler->record.data == NULL) - return NULL; - - /* event type */ - type = ntohl(((Unified2RecordHeader *)spooler->record.header)->type); - - /* event id */ - switch (type) - { - case UNIFIED2_PACKET: - case UNIFIED2_IDS_EVENT: - case UNIFIED2_IDS_EVENT_IPV6: - case UNIFIED2_IDS_EVENT_MPLS: - case UNIFIED2_IDS_EVENT_IPV6_MPLS: - case UNIFIED2_IDS_EVENT_VLAN: - case UNIFIED2_IDS_EVENT_IPV6_VLAN: - event_id = ntohl(((Unified2EventCommon *)spooler->record.data)->event_id); - break; - case UNIFIED2_EXTRA_DATA: - event_id = ntohl(((Unified2ExtraData *)(((Unified2ExtraDataHdr *)spooler->record.data)+1))->event_id); - break; - default: - LogMessage("WARNING: spoolerEventCacheGetBySpooler(): type inconsistent (%d)\n", type); - break; - } - - /* check if there is a previously cached event that matches this event id */ - ernCache = spoolerEventCacheGetByEventID(spooler, event_id); - - return ernCache; -} - -static int spoolerFireLastEvent(Spooler *spooler) -{ - int ret; - EventRecordNode *ernCache; - - ernCache = spoolerEventCacheGetBySpooler(spooler); - - if (ernCache == NULL) - ret = 0; - else - ret = spoolerCallOutputPluginsByERN(ernCache); - - return ret; -} - -static int spoolerCallOutputPluginsByERN(EventRecordNode *ern) -{ - int ret; - - if (ern == NULL) - ret = 0; - else - { - switch (ern->type) - { - case UNIFIED2_IDS_EVENT: - /* if there is a cached packet */ - if (((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet != NULL) - { - CallOutputPlugins(OUTPUT_TYPE__SPECIAL, - ((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet, - ern->data, - ern->type); - free(((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet); - ((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet = NULL; - } - else - CallOutputPlugins(OUTPUT_TYPE__ALERT, - NULL, - ern->data, - ern->type); - break; - case UNIFIED2_IDS_EVENT_MPLS: - case UNIFIED2_IDS_EVENT_VLAN: - /* if there is a cached packet */ - if (((Unified2IDSEvent_WithPED *)ern->data)->packet != NULL) - { - CallOutputPlugins(OUTPUT_TYPE__SPECIAL, - ((Unified2IDSEvent_WithPED *)ern->data)->packet, - ern->data, - ern->type); - free(((Unified2IDSEvent_WithPED *)ern->data)->packet); - ((Unified2IDSEvent_WithPED *)ern->data)->packet = NULL; - } - else - CallOutputPlugins(OUTPUT_TYPE__ALERT, - NULL, - ern->data, - ern->type); - break; - case UNIFIED2_IDS_EVENT_IPV6: - /* if there is a cached packet */ - if (((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet != NULL) - { - CallOutputPlugins(OUTPUT_TYPE__SPECIAL, - ((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet, - ern->data, - ern->type); - free(((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet); - ((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet = NULL; - } - else - CallOutputPlugins(OUTPUT_TYPE__ALERT, - NULL, - ern->data, - ern->type); - break; - case UNIFIED2_IDS_EVENT_IPV6_MPLS: - case UNIFIED2_IDS_EVENT_IPV6_VLAN: - /* if there is a cached packet */ - if (((Unified2IDSEventIPv6_WithPED *)ern->data)->packet != NULL) - { - CallOutputPlugins(OUTPUT_TYPE__SPECIAL, - ((Unified2IDSEventIPv6_WithPED *)ern->data)->packet, - ern->data, - ern->type); - free(((Unified2IDSEventIPv6_WithPED *)ern->data)->packet); - ((Unified2IDSEventIPv6_WithPED *)ern->data)->packet = NULL; - } - else - CallOutputPlugins(OUTPUT_TYPE__ALERT, - NULL, - ern->data, - ern->type); - break; - default: - LogMessage("WARNING: spoolerCallOutputPluginsByERN(): type inconsistent (%d)\n", ern->type); - break; - } - ret = 1; - } - return ret; -} -//rb:fin - static EventRecordNode *spoolerEventCacheGetByEventID(Spooler *spooler, uint32_t event_id) { EventRecordNode *ernCurrent = NULL; @@ -1264,87 +1039,16 @@ static uint8_t spoolerEventCacheHeadUsed(Spooler *spooler) (elm) = (tmpelm)) #endif -//rb:ini -static int spoolerExtraDataCacheClean(EventRecordNode *ern) +static int spoolerEventCacheClean(Spooler *spooler) { - ExtraDataRecordNode *edrn_next = NULL; - ExtraDataRecordNode *edrn = NULL; - ExtraDataRecordCache *edrc = NULL; - void *packet; - - if (ern == NULL) - { - LogMessage("WARNING: spoolerExtraDataCacheClean(): ern is NULL\n"); + EventRecordNode *ernCurrent = NULL; + EventRecordNode *ernPrev = NULL; + + if (spooler == NULL || TAILQ_EMPTY(&spooler->event_cache) ) return 1; - } - - switch (ern->type) - { - case UNIFIED2_IDS_EVENT: - edrc = &(((Unified2IDSEvent_legacy_WithPED *)(ern->data)))->extra_data_cache; - packet = (((Unified2IDSEvent_legacy_WithPED *)(ern->data))->packet); - break; - case UNIFIED2_IDS_EVENT_MPLS: - case UNIFIED2_IDS_EVENT_VLAN: - edrc = &(((Unified2IDSEvent_WithPED *)(ern->data)))->extra_data_cache; - packet = ((Unified2IDSEvent_WithPED *)(ern->data))->packet; - break; - case UNIFIED2_IDS_EVENT_IPV6: - edrc = &(((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data)))->extra_data_cache; - packet = ((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data))->packet; - break; - case UNIFIED2_IDS_EVENT_IPV6_MPLS: - case UNIFIED2_IDS_EVENT_IPV6_VLAN: - edrc = &(((Unified2IDSEventIPv6_WithPED *)(ern->data)))->extra_data_cache; - packet = ((Unified2IDSEventIPv6_WithPED *)(ern->data))->packet; - break; - case UNIFIED2_PACKET: - case UNIFIED2_EXTRA_DATA: - break; - default: - LogMessage("WARNING: spoolerExtraDataCacheClean(): type inconsistent (%d)\n", ern->type); - break; - } - - if (packet) - { - free(packet); - packet = NULL; - } - - if (edrc == NULL || TAILQ_EMPTY(edrc)) - return 1; - - TAILQ_FOREACH_SAFE(edrn, edrn_next, edrc, entry) - { - TAILQ_REMOVE(edrc, edrn, entry); - - if (edrn && edrn->data) - { - free(edrn->data); - edrn->data = NULL; - } - if (edrn) - { - free(edrn); - edrn = NULL; - } - } - - return 0; -} -//rb:fin - -static int spoolerEventCacheClean(Spooler *spooler) -{ - EventRecordNode *ernCurrent = NULL; - EventRecordNode *ernPrev = NULL; - - if (spooler == NULL || TAILQ_EMPTY(&spooler->event_cache) ) - return 1; - - ernCurrent = TAILQ_LAST(&spooler->event_cache,_EventRecordList); - while (ernCurrent != NULL && spooler->events_cached > barnyard2_conf->event_cache_size ) + + ernCurrent = TAILQ_LAST(&spooler->event_cache,_EventRecordList); + while (ernCurrent != NULL && spooler->events_cached > barnyard2_conf->event_cache_size ) { ernPrev = TAILQ_PREV(ernCurrent, _EventRecordList, entry); if ( ernCurrent->used == 1 ) @@ -1610,3 +1314,263 @@ static int spoolerWriteWaldo(Waldo *waldo, Spooler *spooler) return WALDO_FILE_SUCCESS; } +//rb:ini +static Packet * spoolerAllocateFirstPacket(Spooler *spooler) +{ + struct pcap_pkthdr pkth; + Packet *packet = NULL; + + /* allocate space for the packet and construct the packet header */ + packet = SnortAlloc(sizeof(Packet)); + + pkth.caplen = ntohl(((Unified2Packet *)spooler->record.data)->packet_length); + pkth.len = pkth.caplen; + pkth.ts.tv_sec = ntohl(((Unified2Packet *)spooler->record.data)->packet_second); + pkth.ts.tv_usec = ntohl(((Unified2Packet *)spooler->record.data)->packet_microsecond); + + /* decode the packet from the Unified2Packet information */ + datalink = ntohl(((Unified2Packet *)spooler->record.data)->linktype); + DecodePacket(datalink, packet, &pkth, + ((Unified2Packet *)spooler->record.data)->packet_data); + + /* This is a fixup for portscan... */ + if( (packet->iph == NULL) && + ((packet->inner_iph != NULL) && (packet->inner_iph->ip_proto == 255))) + { + packet->iph = packet->inner_iph; + } + + /* check if it's been re-assembled */ + if (packet->packet_flags & PKT_REBUILT_STREAM) + { + DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Packet has been rebuilt from a stream\n");); + } + + return packet; +} + +static int spoolerExtraDataCachePush(Spooler *spooler, uint32_t type, void *data, EventRecordNode *ern) +{ + ExtraDataRecordNode *edrnNode; + ExtraDataRecordCache *edrc; +edrc = &(((Unified2IDSEvent_WithPED *)(ern->data)))->extra_data_cache; + DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Including extra data with cached event %lu\n",ntohl(((Unified2EventCommon *)data)->event_id));); + + /* allocate memory */ + edrnNode = (ExtraDataRecordNode *)SnortAlloc(sizeof(ExtraDataRecordNode)); + + /* create the new node */ + edrnNode->used = 0; + edrnNode->type = type; + edrnNode->data = data; + + /* add new extra data to the front of the cache */ + switch (ern->type) + { + case UNIFIED2_IDS_EVENT: + edrc = &((Unified2IDSEvent_legacy_WithPED *)(ern->data))->extra_data_cache; + break; + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + edrc = &((Unified2IDSEvent_WithPED *)(ern->data))->extra_data_cache; + break; + case UNIFIED2_IDS_EVENT_IPV6: + edrc = &((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data))->extra_data_cache; + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + edrc = &((Unified2IDSEventIPv6_WithPED *)(ern->data))->extra_data_cache; + break; + default: + LogMessage("WARNING: spoolerExtraDataCachePush(): type inconsistent (%d)\n", ern->type); + break; + } + + TAILQ_INSERT_HEAD(edrc, edrnNode, entry); + //((Unified2IDSEvent_WithExtra *)data)->extra_data_cached++; + //DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Cached extra data record: %d\n", ((Unified2IDSEvent_WithExtra *)data)->extra_data_cached);); + + return 0; +} + +/* Fire the last cached event if it exists */ +static void spoolerFireLastEvent(Spooler *spooler) +{ + EventRecordNode *ern; + + if (spooler == NULL) + { + LogMessage("spoolerFireLastEvent(): spooler is NULL\n"); + return; + } + + if (TAILQ_EMPTY(&spooler->event_cache)) + { + LogMessage("spoolerFireLastEvent(): event_cache is empty\n"); + return; + } + + ern = TAILQ_FIRST(&spooler->event_cache); + if (ern->used == 0) + if (spoolerCallOutputPluginsByERN(ern)) + ern->used = 1; +} + +static int spoolerCallOutputPluginsByERN(EventRecordNode *ern) +{ + int ret; + + if (ern == NULL) + ret = 0; + else + { + switch (ern->type) + { + case UNIFIED2_IDS_EVENT: + /* if there is a cached packet */ + if (((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet != NULL) + { + CallOutputPlugins(OUTPUT_TYPE__SPECIAL, + ((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet, + ern->data, + ern->type); + free(((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet); + ((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet = NULL; + } + else + CallOutputPlugins(OUTPUT_TYPE__ALERT, + NULL, + ern->data, + ern->type); + break; + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + /* if there is a cached packet */ + if (((Unified2IDSEvent_WithPED *)ern->data)->packet != NULL) + { + CallOutputPlugins(OUTPUT_TYPE__SPECIAL, + ((Unified2IDSEvent_WithPED *)ern->data)->packet, + ern->data, + ern->type); + free(((Unified2IDSEvent_WithPED *)ern->data)->packet); + ((Unified2IDSEvent_WithPED *)ern->data)->packet = NULL; + } + else + CallOutputPlugins(OUTPUT_TYPE__ALERT, + NULL, + ern->data, + ern->type); + break; + case UNIFIED2_IDS_EVENT_IPV6: + /* if there is a cached packet */ + if (((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet != NULL) + { + CallOutputPlugins(OUTPUT_TYPE__SPECIAL, + ((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet, + ern->data, + ern->type); + free(((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet); + ((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet = NULL; + } + else + CallOutputPlugins(OUTPUT_TYPE__ALERT, + NULL, + ern->data, + ern->type); + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + /* if there is a cached packet */ + if (((Unified2IDSEventIPv6_WithPED *)ern->data)->packet != NULL) + { + CallOutputPlugins(OUTPUT_TYPE__SPECIAL, + ((Unified2IDSEventIPv6_WithPED *)ern->data)->packet, + ern->data, + ern->type); + free(((Unified2IDSEventIPv6_WithPED *)ern->data)->packet); + ((Unified2IDSEventIPv6_WithPED *)ern->data)->packet = NULL; + } + else + CallOutputPlugins(OUTPUT_TYPE__ALERT, + NULL, + ern->data, + ern->type); + break; + default: + LogMessage("WARNING: spoolerCallOutputPluginsByERN(): type inconsistent (%d)\n", ern->type); + break; + } + ret = 1; + } + return ret; +} + +static int spoolerExtraDataCacheClean(EventRecordNode *ern) +{ + ExtraDataRecordNode *edrn_next = NULL; + ExtraDataRecordNode *edrn = NULL; + ExtraDataRecordCache *edrc = NULL; + void *packet; + + if (ern == NULL) + { + LogMessage("WARNING: spoolerExtraDataCacheClean(): ern is NULL\n"); + return 1; + } + + switch (ern->type) + { + case UNIFIED2_IDS_EVENT: + edrc = &((Unified2IDSEvent_legacy_WithPED *)(ern->data))->extra_data_cache; + packet = (((Unified2IDSEvent_legacy_WithPED *)(ern->data))->packet); + break; + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + edrc = &((Unified2IDSEvent_WithPED *)(ern->data))->extra_data_cache; + packet = ((Unified2IDSEvent_WithPED *)(ern->data))->packet; + break; + case UNIFIED2_IDS_EVENT_IPV6: + edrc = &((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data))->extra_data_cache; + packet = ((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data))->packet; + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + edrc = &((Unified2IDSEventIPv6_WithPED *)(ern->data))->extra_data_cache; + packet = ((Unified2IDSEventIPv6_WithPED *)(ern->data))->packet; + break; + case UNIFIED2_PACKET: + case UNIFIED2_EXTRA_DATA: + break; + default: + LogMessage("WARNING: spoolerExtraDataCacheClean(): type inconsistent (%d)\n", ern->type); + break; + } + + if (packet) + { + free(packet); + packet = NULL; + } + + if (edrc == NULL || TAILQ_EMPTY(edrc)) + return 1; + + TAILQ_FOREACH_SAFE(edrn, edrn_next, edrc, entry) + { + TAILQ_REMOVE(edrc, edrn, entry); + + if (edrn && edrn->data) + { + free(edrn->data); + edrn->data = NULL; + } + if (edrn) + { + free(edrn); + edrn = NULL; + } + } + + return 0; +} +//rb:fin From 2c06993bc66a9e6638a6f712afce74e8314f1afc Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Tue, 14 Apr 2015 17:31:31 +0000 Subject: [PATCH 136/198] define RB_EXTRADATA --- src/barnyard2.c | 48 +++++++++++++++------------ src/barnyard2.h | 12 +++---- src/input-plugins/spi_unified2.c | 8 ++--- src/output-plugins/spo_alert_json.c | 31 +++++++++--------- src/plugbase.c | 3 +- src/plugbase.h | 6 ++-- src/rbutil/rb_unified2.c | 2 -- src/spooler.c | 51 +++++++++++------------------ src/spooler.h | 12 ++----- src/unified2.h | 31 +++++++++--------- src/util.c | 4 +-- 11 files changed, 96 insertions(+), 112 deletions(-) diff --git a/src/barnyard2.c b/src/barnyard2.c index 2479f61..05807fb 100644 --- a/src/barnyard2.c +++ b/src/barnyard2.c @@ -55,11 +55,11 @@ #endif #include -//rb:ini (disable the unused time stats) -//#ifdef TIMESTATS -//# include /* added for new time stats function in util.c */ -//#endif -//rb:ini +#ifndef RB_EXTRADATA +#ifdef TIMESTATS +# include /* added for new time stats function in util.c */ +#endif +#endif #ifdef HAVE_STRINGS_H # include @@ -134,9 +134,11 @@ VarNode *cmd_line_var_list = NULL; int exit_signal = 0; static int usr_signal = 0; -//rb:ini + +#ifdef RB_EXTRADATA static int alarm_raised = 0; -//rb:fin +#endif + static volatile int hup_signal = 0; volatile int barnyard2_initializing = 1; @@ -241,9 +243,10 @@ int SignalCheck(void); static void SigExitHandler(int); static void SigUsrHandler(int); static void SigHupHandler(int); -//rb:ini + +#ifdef RB_EXTRADATA static void SigAlrmHandler(int); -//rb:fin +#endif /* F U N C T I O N D E F I N I T I O N S **********************************/ @@ -1062,12 +1065,12 @@ static void SigHupHandler(int signal) return; } -//rb:ini +#ifdef RB_EXTRADATA static void SigAlrmHandler(int signal) { alarm_raised = 1; } -//rb:fin +#endif /**************************************************************************** * @@ -1436,7 +1439,7 @@ int SignalCheck(void) return 0; } -//rb:ini +#ifdef RB_EXTRADATA /* check for alarm activity */ int AlarmCheck(void) { @@ -1454,7 +1457,7 @@ void AlarmClear(void) { alarm_raised = 0; } -//rb:fin +#endif static void InitGlobals(void) { @@ -2178,15 +2181,18 @@ static void InitSignals(void) signal(SIGINT, SigExitHandler); signal(SIGQUIT, SigExitHandler); signal(SIGUSR1, SigUsrHandler); -//rb:ini (define an own SigAlrmHandler and discard the previous and unused one) + +#ifdef RB_EXTRADATA /* define an own SigAlrmHandler and discard the previous and unused one */ signal(SIGALRM, SigAlrmHandler); -//#ifdef TIMESTATS -// /* Establish a handler for SIGALRM signals and set an alarm to go off -// * in approximately one hour. This is used to drop statistics at -// * an interval which the alarm will tell us to do. */ -// signal(SIGALRM, SigAlrmHandler); -//#endif -//rb:fin +#else + #ifdef TIMESTATS + /* Establish a handler for SIGALRM signals and set an alarm to go off + * in approximately one hour. This is used to drop statistics at + * an interval which the alarm will tell us to do. */ + signal(SIGALRM, SigAlrmHandler); + #endif +#endif + signal(SIGHUP, SigHupHandler); diff --git a/src/barnyard2.h b/src/barnyard2.h index 601e4d9..c092308 100644 --- a/src/barnyard2.h +++ b/src/barnyard2.h @@ -146,9 +146,9 @@ //# define PRINT_INTERFACE(i) print_interface(i) #endif -//rb:ini +#ifdef RB_EXTRADATA #define TIME_ALARM 1 // seconds to flush the last cached event -//rb:fin +#endif /* D A T A S T R U C T U R E S *********************************************/ typedef struct _VarEntry @@ -432,9 +432,9 @@ typedef struct _PacketCount uint64_t total_records; uint64_t total_events; uint64_t total_packets; -//rb:ini +#ifdef RB_EXTRADATA uint64_t total_extra_data; -//rb:fin +#endif uint64_t total_processed; uint64_t total_unknown; uint64_t total_suppressed; @@ -582,11 +582,11 @@ Barnyard2Config * Barnyard2ConfNew(void); int Barnyard2Main(int argc, char *argv[]); int Barnyard2Sleep(unsigned int); int SignalCheck(void); -//rb:ini +#ifdef RB_EXTRADATA int AlarmCheck(void); void AlarmStart(int time_alarm); void AlarmClear(void); -//rb:fin +#endif void CleanExit(int); void SigCantHupHandler(int signal); diff --git a/src/input-plugins/spi_unified2.c b/src/input-plugins/spi_unified2.c index 17555d3..3dbefba 100644 --- a/src/input-plugins/spi_unified2.c +++ b/src/input-plugins/spi_unified2.c @@ -160,7 +160,7 @@ int Unified2ReadRecordHeader(void *sph) return 0; } -//rb:ini +#ifdef RB_EXTRADATA unsigned long GetSizeofByType(uint32_t type, uint32_t length) { unsigned long ret = 0; @@ -232,7 +232,7 @@ void InitPEDByType(void *data, uint32_t type) break; } } -//rb:fin +#endif int Unified2ReadRecord(void *sph) { @@ -251,15 +251,13 @@ int Unified2ReadRecord(void *sph) if(!spooler->record.data) { /* SnortAlloc will FatalError if memory can't be assigned */ -//rb:ini -#ifdef rbtest_spi_unified2 +#ifdef RB_EXTRADATA spooler->record.data = SnortAlloc(GetSizeofByType(record_type, record_length)); InitPEDByType(spooler->record.data, record_type); #else spooler->record.data = SnortAlloc(record_length); #endif -//rb:fin } if (spooler->offset < record_length) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 21d33cc..c6d2aa2 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -93,10 +93,8 @@ // Note: Always including ,sensor_name,domain_name,group_name,src_net_name,src_as_name,dst_net_name,dst_as_name //#define SEND_NAMES -//rb:ini -//#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" -#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,file_sha256,file_size,file_hostname,file_uri,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" -//rb:fin + +#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" #ifdef HAVE_GEOIP #define DEFAULT_JSON_1 DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ @@ -116,6 +114,12 @@ #define DEFAULT_JSON DEFAULT_JSON_2 #endif +#ifdef RB_EXTRADATA +#define DEFAULT_JSON_3 DEFAULT_JSON ",file_sha256,file_size,file_hostname,file_uri" +#else +#define DEFAULT_JSON_3 DEFAULT_JSON +#endif + #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" #define DEFAULT_LIMIT (128*M_BYTES) @@ -148,12 +152,12 @@ typedef enum{ ACTION, CLASSIFICATION, MSG, -//rb:ini +#ifdef RB_EXTRADATA FILE_SHA256, FILE_SIZE, FILE_HOSTNAME, FILE_URI, -//rb:fin +#endif PAYLOAD, PROTO, PROTO_ID, @@ -281,12 +285,12 @@ static AlertJSONTemplateElement template[] = { {PRIORITY,"priority","priority",stringFormat,"unknown"}, {CLASSIFICATION,"classification","classification",stringFormat,"-"}, {MSG,"msg","msg",stringFormat,"-"}, -//rb:ini +#ifdef RB_EXTRADATA {FILE_SHA256,"file_sha256","file_sha256",stringFormat,"-"}, {FILE_SIZE,"file_size","file_size",stringFormat,"-"}, {FILE_HOSTNAME,"file_hostname","file_hostname",stringFormat,"-"}, {FILE_URI,"file_uri","file_uri",stringFormat,"-"}, -//rb:fin +#endif {PAYLOAD,"payload","payload",stringFormat,"-"}, {PROTO,"l4_proto_name","l4_proto_name",stringFormat,"-"}, {PROTO_ID,"l4_proto","l4_proto",numericFormat,"0"}, @@ -858,8 +862,6 @@ char* _itoa(uint64_t value, char* result, int base, size_t bufsize) { /* shortcut to used bases */ static inline char *itoa10(uint64_t value,char *result,const size_t bufsize){return _itoa(value,result,10,bufsize);} -//rb:ini -//static inline char *itoa16(uint64_t value,char *result,const size_t bufsize){return _itoa(value,result,16,bufsize);} static inline char *itoa16(uint64_t value,char *result,const size_t bufsize){ char *ret = _itoa(value,result,16,bufsize); if(value < 16 && ret > result){ @@ -868,7 +870,6 @@ static inline char *itoa16(uint64_t value,char *result,const size_t bufsize){ } return ret; } -//rb:fin static inline void printHWaddr(KafkaLog *kafka,const uint8_t *addr,char * buf,const size_t bufLen){ int i; @@ -1236,7 +1237,7 @@ static char *extract_AS(AlertJSONData *jsonData,const sfip_t *ip) #endif -//rb:ini +#ifdef RB_EXTRADATA static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, KafkaLog *kafka, Unified2ExtraData *U2ExtraData) { uint32_t event_info; /* type in Unified2 Event */ @@ -1334,7 +1335,7 @@ static int printElementExtraData(void *event, uint32_t event_type, AlertJSONTemp return 0; } -//rb:fin +#endif /* * Function: PrintElementWithTemplate(Packet *, char *, FILE *, char *, numargs const int) @@ -1478,7 +1479,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, } } break; -//rb:ini +#ifdef RB_EXTRADATA case FILE_SHA256: case FILE_SIZE: case FILE_URI: @@ -1486,7 +1487,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, if (event != NULL) printElementExtraData(event, event_type, templateElement, kafka); break; -//rb:fin +#endif case PAYLOAD: { /* Sending packet payload (Packet->data) inside kafka message, instead of diff --git a/src/plugbase.c b/src/plugbase.c index e518dc1..68f6bb5 100644 --- a/src/plugbase.c +++ b/src/plugbase.c @@ -681,8 +681,7 @@ void CallOutputPlugins(OutputType out_type, Packet *packet, void *event, uint32_ return; } -//rb:ini (this piece of code should probably be altered) -//rb:fin + if (out_type == OUTPUT_TYPE__SPECIAL) { idx = AlertList; diff --git a/src/plugbase.h b/src/plugbase.h index 5c2ea4a..fde4083 100644 --- a/src/plugbase.h +++ b/src/plugbase.h @@ -86,10 +86,12 @@ typedef enum _OutputType OUTPUT_TYPE__ALERT = 1, OUTPUT_TYPE__LOG, OUTPUT_TYPE__SPECIAL, +#ifdef RB_EXTRADATA OUTPUT_TYPE__MAX, -//rb:ini OUTPUT_TYPE__EXTRA_DATA -//rb:fin +#else + OUTPUT_TYPE__MAX +#endif } OutputType; diff --git a/src/rbutil/rb_unified2.c b/src/rbutil/rb_unified2.c index dfa02d9..98d8195 100644 --- a/src/rbutil/rb_unified2.c +++ b/src/rbutil/rb_unified2.c @@ -33,9 +33,7 @@ #include #include "unified2.h" -//rb:ini #include "util.h" -//rb:fin #include #define U2_FLAG_ALLOWED 0x00 // impact_flag = 0 (packet allowed) diff --git a/src/spooler.c b/src/spooler.c index 56ba218..e25716c 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -63,13 +63,13 @@ static EventRecordNode * spoolerEventCacheGetHead(Spooler *); static uint8_t spoolerEventCacheHeadUsed(Spooler *); static int spoolerEventCacheClean(Spooler *); -//rb:ini +#ifdef RB_EXTRADATA static Packet * spoolerAllocateFirstPacket(Spooler *); static int spoolerExtraDataCachePush(Spooler *, uint32_t, void *, EventRecordNode *); static void spoolerFireLastEvent(Spooler *); static int spoolerCallOutputPluginsByERN (EventRecordNode *); static int spoolerExtraDataCacheClean(EventRecordNode *ern); -//rb:fin +#endif /* Find the next spool file timestamp extension with a value equal to or * greater than timet. If extension != NULL, the extension will be @@ -531,14 +531,14 @@ int ProcessContinuous(const char *dirpath, const char *filebase, continue; } -//rb:ini +#ifdef RB_EXTRADATA if (AlarmCheck()) { spoolerFireLastEvent(spooler); AlarmClear(); } else -//rb:fin +#endif /* act according to current spooler state */ switch(spooler->state) { @@ -700,11 +700,9 @@ int ProcessContinuousWithWaldo(Waldo *waldo) static void spoolerProcessRecord(Spooler *spooler, int fire_output) { -//rb:ini -#ifndef rbtest_spooler +#ifndef RB_EXTRADATA struct pcap_pkthdr pkth; #endif -//rb:fin uint32_t type; EventRecordNode *ernCache; @@ -726,11 +724,11 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) case UNIFIED2_IDS_EVENT_IPV6_VLAN: pc.total_events++; break; -//rb:ini +#ifdef RB_EXTRADATA case UNIFIED2_EXTRA_DATA: pc.total_extra_data++; break; -//rb:fin +#endif default: pc.total_unknown++; } @@ -744,8 +742,7 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) /* check if there is a previously cached event that matches this event id */ ernCache = spoolerEventCacheGetByEventID(spooler, event_id); -//rb:ini -#ifdef rbtest_spooler +#ifdef RB_EXTRADATA datalink = ntohl(((Unified2Packet *)spooler->record.data)->linktype); /* if the packet and cached event share the same id */ @@ -867,7 +864,6 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) free(spooler->record.pkt); spooler->record.pkt = NULL; #endif -//rb:fin /* waldo operations occur after the output plugins are called */ if (fire_output) @@ -886,8 +882,7 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) ernCache = spoolerEventCacheGetHead(spooler); -//rb:ini -#ifdef rbtest_spooler +#ifdef RB_EXTRADATA /* not checked ernCache->used == 0 since this cached event must be fired in any case, even though the expected value should be ernCache->used = 0 */ if (fire_output) @@ -899,7 +894,6 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) ernCache->data, ernCache->type); #endif -//rb:fin /* flush the event cache flag */ ernCache->used = 1; @@ -915,7 +909,7 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) } else if (type == UNIFIED2_EXTRA_DATA) { -//rb:ini +#ifdef RB_EXTRADATA /* convert event id once */ uint32_t event_id = ntohl(((Unified2ExtraData *)(((Unified2ExtraDataHdr *)spooler->record.data)+1))->event_id); @@ -934,7 +928,7 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) // We are assuming that an extra data record will never show up before an event record does // This hypothetical case should be taken into account after testings //} -//rb:fin +#endif /* waldo operations occur after the output plugins are called */ if (fire_output) @@ -964,10 +958,10 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) /* clean the cache out */ spoolerEventCacheClean(spooler); -//rb:ini +#ifdef RB_EXTRADATA /* If there is no more records in TIME_ALARM seconds flush the cached records */ AlarmStart(TIME_ALARM); -//rb:fin +#endif } static int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) @@ -984,16 +978,9 @@ static int spoolerEventCachePush(Spooler *spooler, uint32_t type, void *data) ernNode->type = type; ernNode->data = data; -//rb:ini (Si no se consigue inicializar a NULL en spi_unified2.c, habría que plantearse hacerlo aquí.) - ((Unified2IDSEvent_WithPED *)ernNode->data)->packet = NULL; -//rb:fin - /* add new events to the front of the cache */ TAILQ_INSERT_HEAD(&spooler->event_cache, ernNode, entry); spooler->events_cached++; -//rb:ini (test) - //printf ("spooler: %x | Cached event %d with id '%d'\n", (int )(&spooler), spooler->events_cached, ntohl(((Unified2EventCommon *)data)->event_id)); -//rb:fin DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Cached event: %d\n", spooler->events_cached);); @@ -1059,9 +1046,9 @@ static int spoolerEventCacheClean(Spooler *spooler) if(ernCurrent->data != NULL) { -//rb:ini +#ifdef RB_EXTRADATA spoolerExtraDataCacheClean(ernCurrent); -//rb:fin +#endif free(ernCurrent->data); } @@ -1088,9 +1075,9 @@ void spoolerEventCacheFlush(Spooler *spooler) if(evt_ptr->data) { -//rb:ini +#ifdef RB_EXTRADATA spoolerExtraDataCacheClean(evt_ptr); -//rb:fin +#endif free(evt_ptr->data); evt_ptr->data = NULL; } @@ -1314,7 +1301,7 @@ static int spoolerWriteWaldo(Waldo *waldo, Spooler *spooler) return WALDO_FILE_SUCCESS; } -//rb:ini +#ifdef RB_EXTRADATA static Packet * spoolerAllocateFirstPacket(Spooler *spooler) { struct pcap_pkthdr pkth; @@ -1573,4 +1560,4 @@ static int spoolerExtraDataCacheClean(EventRecordNode *ern) return 0; } -//rb:fin +#endif diff --git a/src/spooler.h b/src/spooler.h index a40d017..a6e7aaa 100644 --- a/src/spooler.h +++ b/src/spooler.h @@ -31,9 +31,9 @@ #include #include "plugbase.h" -//rb:ini +#ifdef RB_EXTRADATA #include "unified2.h" -//rb:fin +#endif #define SPOOLER_EXTENSION_FOUND 0 #define SPOOLER_EXTENSION_NONE 1 @@ -62,14 +62,6 @@ #define MAX_FILEPATH_BUF 1024 -//rb:ini (test) -#define rbtest -#ifdef rbtest - #define rbtest_spooler - #define rbtest_spi_unified2 -#endif -//rb:fin (test) - typedef struct _Record { /* raw data */ diff --git a/src/unified2.h b/src/unified2.h index 96943c3..73b65b3 100644 --- a/src/unified2.h +++ b/src/unified2.h @@ -30,9 +30,9 @@ #include "config.h" #endif -//rb:ini +#ifdef RB_EXTRADATA #include -//rb:fin +#endif //SNORT DEFINES //Long time ago... @@ -48,7 +48,7 @@ #define UNIFIED2_IDS_EVENT_IPV6_VLAN 105 #define UNIFIED2_EXTRA_DATA 110 -//rb:ini +#ifdef RB_EXTRADATA typedef struct _ExtraDataRecordNode { uint32_t type; @@ -59,7 +59,7 @@ typedef struct _ExtraDataRecordNode } ExtraDataRecordNode; typedef TAILQ_HEAD(_ExtraDataRecordList, _ExtraDataRecordNode) ExtraDataRecordCache; -//rb:fin +#endif /* Each unified2 record will start out with one of these */ typedef struct _Unified2RecordHeader @@ -94,7 +94,7 @@ typedef struct _Unified2IDSEvent uint16_t pad2;//Policy ID } Unified2IDSEvent; -//rb:ini +#ifdef RB_EXTRADATA typedef struct _Unified2IDSEvent_WithPED { Unified2IDSEvent event; @@ -102,7 +102,7 @@ typedef struct _Unified2IDSEvent_WithPED ExtraDataRecordCache extra_data_cache; //uint32_t extra_data_cached; }Unified2IDSEvent_WithPED; -//rb:fin +#endif //UNIFIED2_IDS_EVENT_IPV6_VLAN = type 105 typedef struct _Unified2IDSEventIPv6 @@ -129,7 +129,7 @@ typedef struct _Unified2IDSEventIPv6 uint16_t pad2;/*could be IPS Policy local id to support local sensor alerts*/ } Unified2IDSEventIPv6; -//rb:ini +#ifdef RB_EXTRADATA typedef struct _Unified2IDSEventIPv6_WithPED { Unified2IDSEventIPv6 event; @@ -137,7 +137,7 @@ typedef struct _Unified2IDSEventIPv6_WithPED ExtraDataRecordCache extra_data_cache; //linked list of concurrent extra data records //uint32_t extra_data_cached; }Unified2IDSEventIPv6_WithPED; -//rb:fin +#endif //UNIFIED2_PACKET = type 2 typedef struct _Unified2Packet @@ -174,8 +174,7 @@ typedef enum _EventInfoEnum EVENT_INFO_XFF_IPV4 = 1, EVENT_INFO_XFF_IPV6 , EVENT_INFO_REVIEWED_BY, -//rb:ini - //EVENT_INFO_GZIP_DATA +#ifdef RB_EXTRADATA EVENT_INFO_GZIP_DATA, EVENT_INFO_SMTP_FILENAME, EVENT_INFO_SMTP_MAILFROM, @@ -190,7 +189,9 @@ typedef enum _EventInfoEnum EVENT_INFO_FILE_SIZE, EVENT_INFO_FILE_URI, EVENT_INFO_FILE_HOSTNAME -//rb:fin +#else + EVENT_INFO_GZIP_DATA +#endif }EventInfoEnum; typedef enum _EventDataType @@ -229,7 +230,7 @@ typedef struct Unified2IDSEvent_legacy uint8_t blocked; } Unified2IDSEvent_legacy; -//rb:ini +#ifdef RB_EXTRADATA typedef struct _Unified2IDSEvent_legacy_WithPED { Unified2IDSEventIPv6 event; @@ -237,7 +238,7 @@ typedef struct _Unified2IDSEvent_legacy_WithPED ExtraDataRecordCache extra_data_cache; //linked list of concurrent extra data records //uint32_t extra_data_cached; }Unified2IDSEvent_legacy_WithPED; -//rb:fin +#endif //----------LEGACY, type '72' typedef struct Unified2IDSEventIPv6_legacy @@ -261,7 +262,7 @@ typedef struct Unified2IDSEventIPv6_legacy uint8_t blocked; } Unified2IDSEventIPv6_legacy; -//rb:ini +#ifdef RB_EXTRADATA typedef struct _Unified2IDSEventIPv6_legacy_WithPED { Unified2IDSEventIPv6 event; @@ -269,7 +270,7 @@ typedef struct _Unified2IDSEventIPv6_legacy_WithPED ExtraDataRecordCache extra_data_cache; //linked list of concurrent extra data records //uint32_t extra_data_cached; }Unified2IDSEventIPv6_legacy_WithPED; -//rb:fin +#endif ////////////////////-->LEGACY diff --git a/src/util.c b/src/util.c index 5718997..d9c2f24 100644 --- a/src/util.c +++ b/src/util.c @@ -842,10 +842,10 @@ void DropStats(int exiting) CalcPct(pc.total_events, pc.total_records)); LogMessage(" Packets:" FMTu64("12") " (%.3f%%)\n", pc.total_packets, CalcPct(pc.total_packets, pc.total_records)); -//rb:ini +#ifdef RB_EXTRADATA LogMessage(" Extra Data:" FMTu64("9") " (%.3f%%)\n", pc.total_extra_data, CalcPct(pc.total_extra_data, pc.total_records)); -//rb:fin +#endif LogMessage(" Unknown:" FMTu64("12") " (%.3f%%)\n", pc.total_unknown, CalcPct(pc.total_unknown, pc.total_records)); LogMessage(" Suppressed:" FMTu64("9") " (%.3f%%)\n", pc.total_suppressed, From c5a3d4502ed5f762be536a5f4d0f0226754e0dc8 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Wed, 15 Apr 2015 08:37:35 +0000 Subject: [PATCH 137/198] Including macro RB_EXTRADATA in configure. Short change in spoolerExtraDataCacheClean(). --- .gitignore | 3 +- configure.in | 11 ++ src/rbutil/Makefile.in | 226 +++++++++++------------------------------ src/spooler.c | 2 +- 4 files changed, 74 insertions(+), 168 deletions(-) diff --git a/.gitignore b/.gitignore index d253bf0..01fef8c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ aclocal.m4 autom4te.cache/ cflags.out /config.* -configure cppflags.out install-sh libtool @@ -14,7 +13,7 @@ m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 -Makefile +Makefileq missing src/barnyard2 src/input-plugins/libspi.a diff --git a/configure.in b/configure.in index eff9257..6954bc4 100644 --- a/configure.in +++ b/configure.in @@ -161,6 +161,17 @@ else AC_MSG_RESULT(no) fi +AC_ARG_ENABLE(extradata, +[ --enable-extradata Enable ExtraData collection.], + enable_extradata="$enableval", enable_extradata="no") + +if test "x$enable_extradata" = "xyes"; then + AC_MSG_RESULT(yes) + AC_DEFINE_UNQUOTED([RB_EXTRADATA],[],[ExtraData collection]) +else + AC_MSG_RESULT(no) +fi + AC_ARG_WITH(macs-vendors-includes, [ --with-macs-vendors-include=DIR librb_macs_vendors include directory], [with_macsvendors_includes="$withval"],[with_macsvendors_includes="no"]) diff --git a/src/rbutil/Makefile.in b/src/rbutil/Makefile.in index e00411a..874098d 100644 --- a/src/rbutil/Makefile.in +++ b/src/rbutil/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,51 +16,6 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -79,7 +35,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/rbutil -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -93,82 +49,30 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru -AM_V_AR = $(am__v_AR_@AM_V@) -am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -am__v_AR_1 = librbutil_a_AR = $(AR) $(ARFLAGS) librbutil_a_LIBADD = am_librbutil_a_OBJECTS = rb_kafka.$(OBJEXT) \ rb_numstrpair_list.$(OBJEXT) rb_unified2.$(OBJEXT) librbutil_a_OBJECTS = $(am_librbutil_a_OBJECTS) -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(librbutil_a_SOURCES) DIST_SOURCES = $(librbutil_a_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -227,7 +131,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ @@ -331,11 +234,10 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) - -librbutil.a: $(librbutil_a_OBJECTS) $(librbutil_a_DEPENDENCIES) $(EXTRA_librbutil_a_DEPENDENCIES) - $(AM_V_at)-rm -f librbutil.a - $(AM_V_AR)$(librbutil_a_AR) librbutil.a $(librbutil_a_OBJECTS) $(librbutil_a_LIBADD) - $(AM_V_at)$(RANLIB) librbutil.a +librbutil.a: $(librbutil_a_OBJECTS) $(librbutil_a_DEPENDENCIES) + -rm -f librbutil.a + $(librbutil_a_AR) librbutil.a $(librbutil_a_OBJECTS) $(librbutil_a_LIBADD) + $(RANLIB) librbutil.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -344,13 +246,13 @@ distclean-compile: -rm -f *.tab.c .c.o: - $(AM_V_CC)$(COMPILE) -c $< + $(COMPILE) -c $< .c.obj: - $(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'` + $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: - $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< + $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -358,15 +260,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ - $(am__define_uniq_tagged_files); \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -378,11 +291,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) $$unique; \ fi; \ fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -391,21 +308,6 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -454,15 +356,10 @@ install-am: all-am installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -545,19 +442,18 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/spooler.c b/src/spooler.c index e25716c..8a4d674 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -1497,7 +1497,7 @@ static int spoolerExtraDataCacheClean(EventRecordNode *ern) ExtraDataRecordNode *edrn_next = NULL; ExtraDataRecordNode *edrn = NULL; ExtraDataRecordCache *edrc = NULL; - void *packet; + void *packet = NULL; if (ern == NULL) { From 185858fae2907f0929934d016aa963a368ed3287 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Fri, 17 Apr 2015 06:30:28 +0000 Subject: [PATCH 138/198] Changing the way DEFAULT_JSON is defined. Including code to write URI and hostname as ExtraData. --- src/output-plugins/spo_alert_json.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index c6d2aa2..7d11337 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -97,29 +97,31 @@ #define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" #ifdef HAVE_GEOIP -#define DEFAULT_JSON_1 DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ +#define FIELDS_GEOIP ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ #else -#define DEFAULT_JSON_1 DEFAULT_JSON_0 +#define FIELDS_GEOIP #endif #ifdef HAVE_RB_MAC_VENDORS -#define DEFAULT_JSON_2 DEFAULT_JSON_1 ",ethsrc_vendor,ethdst_vendor" +#define FIELDS_MAC_VENDORS ",ethsrc_vendor,ethdst_vendor" #else -#define DEFAULT_JSON_2 DEFAULT_JSON_1 +#define FIELDS_MAC_VENDORS #endif #ifdef SEND_NAMES -#define DEFAULT_JSON DEFAULT_JSON_2 ",l4_proto_name,src_name,dst_name,l4_srcport_name,l4_dstport_name,vlan_name" +#define FIELDS_PROTO_NAMES ",l4_proto_name,src_name,dst_name,l4_srcport_name,l4_dstport_name,vlan_name" #else -#define DEFAULT_JSON DEFAULT_JSON_2 +#define FIELDS_PROTO_NAMES #endif #ifdef RB_EXTRADATA -#define DEFAULT_JSON_3 DEFAULT_JSON ",file_sha256,file_size,file_hostname,file_uri" +#define FIELDS_EXTRADATA ",file_sha256,file_size,file_hostname,file_uri" #else -#define DEFAULT_JSON_3 DEFAULT_JSON +#define FIELDS_EXTRADATA #endif +#define DEFAULT_JSON DEFAULT_JSON_0 FIELDS_GEOIP FIELDS_MAC_VENDORS FIELDS_PROTO_NAMES FIELDS_EXTRADATA + #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" #define DEFAULT_LIMIT (128*M_BYTES) @@ -1275,13 +1277,17 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, case FILE_URI: if (event_info == EVENT_INFO_FILE_URI) { - + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + KafkaLog_Write(kafka, str, len); } break; case FILE_HOSTNAME: if (event_info == EVENT_INFO_FILE_HOSTNAME) { - + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + KafkaLog_Write(kafka, str, len); } break; default: From e0177f34d8c3552d1628c22327ecb85b3532a63e Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Tue, 28 Apr 2015 15:02:20 +0000 Subject: [PATCH 139/198] changed file_sha256 by sha256 in spo_alert_json.c --- src/output-plugins/spo_alert_json.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 7d11337..f9995b9 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -115,7 +115,7 @@ #endif #ifdef RB_EXTRADATA -#define FIELDS_EXTRADATA ",file_sha256,file_size,file_hostname,file_uri" +#define FIELDS_EXTRADATA ",sha256,file_size,file_hostname,file_uri" #else #define FIELDS_EXTRADATA #endif @@ -155,7 +155,7 @@ typedef enum{ CLASSIFICATION, MSG, #ifdef RB_EXTRADATA - FILE_SHA256, + SHA256, FILE_SIZE, FILE_HOSTNAME, FILE_URI, @@ -288,7 +288,7 @@ static AlertJSONTemplateElement template[] = { {CLASSIFICATION,"classification","classification",stringFormat,"-"}, {MSG,"msg","msg",stringFormat,"-"}, #ifdef RB_EXTRADATA - {FILE_SHA256,"file_sha256","file_sha256",stringFormat,"-"}, + {SHA256,"sha256","sha256",stringFormat,"-"}, {FILE_SIZE,"file_size","file_size",stringFormat,"-"}, {FILE_HOSTNAME,"file_hostname","file_hostname",stringFormat,"-"}, {FILE_URI,"file_uri","file_uri",stringFormat,"-"}, @@ -1250,7 +1250,7 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, switch (templateElement->id) { - case FILE_SHA256: + case SHA256: if (event_info == EVENT_INFO_FILE_SHA256) { const uint8_t *sha_str = (uint8_t *)(U2ExtraData+1); @@ -1486,7 +1486,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, } break; #ifdef RB_EXTRADATA - case FILE_SHA256: + case SHA256: case FILE_SIZE: case FILE_URI: case FILE_HOSTNAME: From 9285734613ad7ad8f4d96b962022712f67ba9925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 18 May 2015 09:57:25 +0000 Subject: [PATCH 140/198] Using X macros to avoid ID/function duplication --- src/output-plugins/spo_alert_json.c | 249 ++++++++++------------------ 1 file changed, 89 insertions(+), 160 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 32901ff..d834e58 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -97,14 +97,28 @@ #ifdef HAVE_GEOIP #define DEFAULT_JSON_1 DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ +#define X_RB_GEOIP \ + _X(SRC_COUNTRY,"src_country","src_country",stringFormat,"N/A") \ + _X(DST_COUNTRY,"dst_country","dst_country",stringFormat,"N/A") \ + _X(SRC_COUNTRY_CODE,"src_country_code","src_country_code",stringFormat,"N/A") \ + _X(DST_COUNTRY_CODE,"dst_country_code","dst_country_code",stringFormat,"N/A") \ + _X(SRC_AS,"src_as","src_as",numericFormat, 0) \ + _X(DST_AS,"dst_as","dst_as",numericFormat, 0) \ + _X(SRC_AS_NAME,"src_as_name","src_as_name",stringFormat,"N/A") \ + _X(DST_AS_NAME,"dst_as_name","dst_as_name",stringFormat,"N/A") #else #define DEFAULT_JSON_1 DEFAULT_JSON_0 +#define X_RB_GEOIP #endif #ifdef HAVE_RB_MAC_VENDORS #define DEFAULT_JSON_2 DEFAULT_JSON_1 ",ethsrc_vendor,ethdst_vendor" +#define X_RB_MAC_VENDORS \ + _X(ETHSRC_VENDOR,"ethsrc_vendor","ethsrc_vendor",stringFormat,"-") \ + _X(ETHDST_VENDOR,"ethdst_vendor","ethdst_vendor",stringFormat,"-") #else #define DEFAULT_JSON_2 DEFAULT_JSON_1 +#define X_RB_MAC_VENDORS #endif #ifdef SEND_NAMES @@ -126,89 +140,80 @@ #define FIELD_NAME_VALUE_SEPARATOR ": " #define JSON_FIELDS_SEPARATOR ", " +#define X_FUNCTION_TEMPLATE \ + _X(TIMESTAMP,"timestamp","timestamp",numericFormat,"0") \ + _X(SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat,"0") \ + _X(SENSOR_ID,"sensor_id","sensor_id",numericFormat,"0") \ + _X(SENSOR_IP,"sensor_ip","sensor_ip",stringFormat,"0") \ + _X(SENSOR_NAME,"sensor_name","sensor_name",stringFormat,"-") \ + _X(DOMAIN_NAME,"domain_name","domain_name",stringFormat,"-") \ + _X(DOMAIN_ID,"domain_id","domain_id",numericFormat,"-") \ + _X(GROUP_NAME,"group_name","group_name",stringFormat,"-") \ + _X(GROUP_ID,"group_id","group_id",numericFormat,"-") \ + _X(TYPE,"type","type",stringFormat,"-") \ + _X(ACTION,"action","action",stringFormat,"-") \ + _X(SIG_GENERATOR,"sig_generator","sig_generator",numericFormat,"0") \ + _X(SIG_ID,"sig_id","sig_id",numericFormat,"0") \ + _X(SIG_REV,"sig_rev","rev",numericFormat,"0") \ + _X(PRIORITY,"priority","priority",stringFormat,"unknown") \ + _X(CLASSIFICATION,"classification","classification",stringFormat,"-") \ + _X(MSG,"msg","msg",stringFormat,"-") \ + _X(PAYLOAD,"payload","payload",stringFormat,"-") \ + _X(PROTO,"l4_proto_name","l4_proto_name",stringFormat,"-") \ + _X(PROTO_ID,"l4_proto","l4_proto",numericFormat,"0") \ + _X(ETHSRC,"ethsrc","ethsrc",stringFormat,"-") \ + _X(ETHDST,"ethdst","ethdst",stringFormat,"-") \ + X_RB_MAC_VENDORS \ + _X(ETHTYPE,"ethtype","ethtype",numericFormat,"0") \ + _X(ARP_HW_SADDR,"arp_hw_saddr","arp_hw_saddr",stringFormat,"-") \ + _X(ARP_HW_SPROT,"arp_hw_sprot","arp_hw_sprot",stringFormat,"-") \ + _X(ARP_HW_TADDR,"arp_hw_taddr","arp_hw_taddr",stringFormat,"-") \ + _X(ARP_HW_TPROT,"arp_hw_tprot","arp_hw_tprot",stringFormat,"-") \ + _X(VLAN,"vlan","vlan",numericFormat,"0") \ + _X(VLAN_NAME,"vlan_name","vlan_name",stringFormat,"0") \ + _X(VLAN_PRIORITY,"vlan_priority","vlan_priority",numericFormat,"0") \ + _X(VLAN_DROP,"vlan_drop","vlan_drop",numericFormat,"0") \ + _X(UDPLENGTH,"udplength","udplength",numericFormat,"0") \ + _X(ETHLENGTH,"ethlen","ethlength",numericFormat,"0") \ + _X(ETHLENGTH_RANGE,"ethlength_range","ethlength_range",stringFormat,"0") \ + _X(TRHEADER,"trheader","trheader",stringFormat,"-") \ + _X(SRCPORT,"l4_srcport","src_port",numericFormat,"0") \ + _X(SRCPORT_NAME,"l4_srcport_name","src_port_name",stringFormat,"-") \ + _X(DSTPORT,"l4_dstport","dst_port",numericFormat,"0") \ + _X(DSTPORT_NAME,"l4_dstport_name","dst_port_name",stringFormat,"-") \ + _X(SRC_TEMPLATE_ID,"src_asnum","src_asnum",numericFormat,"0") \ + _X(SRC_STR,"src","src",stringFormat,"-") \ + _X(SRC_NAME,"src_name","src_name",stringFormat,"-") \ + _X(SRC_NET,"src_net","src_net",stringFormat,"0.0.0.0/0") \ + _X(SRC_NET_NAME,"src_net_name","src_net_name",stringFormat,"0.0.0.0/0") \ + _X(DST_TEMPLATE_ID,"dst_asnum","dst_asnum",stringFormat,"0") \ + _X(DST_NAME,"dst_name","dst_name",stringFormat,"-") \ + _X(DST_STR,"dst","dst",stringFormat,"-") \ + _X(DST_NET,"dst_net","dst_net",stringFormat,"0.0.0.0/0") \ + _X(DST_NET_NAME,"dst_net_name","dst_net_name",stringFormat,"0.0.0.0/0") \ + _X(ICMPTYPE,"icmptype","icmptype",numericFormat,"0") \ + _X(ICMPCODE,"icmpcode","icmpcode",numericFormat,"0") \ + _X(ICMPID,"icmpid","icmpid",numericFormat,"0") \ + _X(ICMPSEQ,"icmpseq","icmpseq",numericFormat,"0") \ + _X(TTL,"ttl","ttl",numericFormat,"0") \ + _X(TOS,"tos","tos",numericFormat,"0") \ + _X(ID,"id","id",numericFormat,"0") \ + _X(IPLEN,"iplen","iplen",numericFormat,"0") \ + _X(IPLEN_RANGE,"iplen_range","iplen_range",stringFormat,"0") \ + _X(DGMLEN,"dgmlen","dgmlen",numericFormat,"0") \ + _X(TCPSEQ,"tcpseq","tcpseq",numericFormat,"0") \ + _X(TCPACK,"tcpack","tcpack",numericFormat,"0") \ + _X(TCPLEN,"tcplen","tcplen",numericFormat,"0") \ + _X(TCPWINDOW,"tcpwindow","tcpwindow",numericFormat,"0") \ + _X(TCPFLAGS,"tcpflags","tcpflags",stringFormat,"-") \ + X_RB_GEOIP \ + _X(TEMPLATE_END_ID,"","",numericFormat,"0") + /* If you change some of this, remember to change printElementWithTemplate too */ typedef enum{ - TIMESTAMP, - SENSOR_ID_SNORT, - SENSOR_ID, - SENSOR_NAME, - SENSOR_IP, - DOMAIN_ID, - DOMAIN_NAME, - GROUP_ID, - GROUP_NAME, - TYPE, - SIG_GENERATOR, - SIG_ID, - SIG_REV, - PRIORITY, - ACTION, - CLASSIFICATION, - MSG, - PAYLOAD, - PROTO, - PROTO_ID, - ETHSRC, - ETHDST, -#ifdef HAVE_RB_MAC_VENDORS - ETHSRC_VENDOR, - ETHDST_VENDOR, -#endif - ETHTYPE, - VLAN, /* See vlan header */ - VLAN_NAME, - VLAN_PRIORITY, - VLAN_DROP, - ARP_HW_SADDR, /* Sender ARP Hardware Address */ - ARP_HW_SPROT, /* Sender ARP Hardware Protocol */ - ARP_HW_TADDR, /* Destination ARP Hardware Address */ - ARP_HW_TPROT, /* Destination ARP Hardware Protocol */ - UDPLENGTH, - ETHLENGTH, - ETHLENGTH_RANGE, - TRHEADER, - SRCPORT, - DSTPORT, - SRCPORT_NAME, - DSTPORT_NAME, - SRC_TEMPLATE_ID, - SRC_STR, - SRC_NAME, - SRC_NET, - SRC_NET_NAME, - DST_TEMPLATE_ID, - DST_NAME, - DST_STR, - DST_NET, - DST_NET_NAME, - ICMPTYPE, - ICMPCODE, - ICMPID, - ICMPSEQ, - TTL, - TOS, - ID, - IPLEN, - IPLEN_RANGE, - DGMLEN, - TCPSEQ, - TCPACK, - TCPLEN, - TCPWINDOW, - TCPFLAGS, - -#ifdef HAVE_GEOIP - SRC_COUNTRY, - DST_COUNTRY, - SRC_COUNTRY_CODE, - DST_COUNTRY_CODE, - SRC_AS, - DST_AS, - SRC_AS_NAME, - DST_AS_NAME, -#endif // HAVE_GEOIP - - TEMPLATE_END_ID + #define _X(a,b,c,d,e) a, + X_FUNCTION_TEMPLATE + #undef _X }TEMPLATE_ID; typedef enum{stringFormat,numericFormat} JsonPrintFormat; @@ -255,85 +260,9 @@ static const char *priority_name[] = {NULL, "high", "medium", "low", "very low"} /* Remember update printElementWithTemplate if some element modified here */ static AlertJSONTemplateElement template[] = { - {TIMESTAMP,"timestamp","timestamp",numericFormat,"0"}, - {SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat,"0"}, - {SENSOR_ID,"sensor_id","sensor_id",numericFormat,"0"}, - {SENSOR_IP,"sensor_ip","sensor_ip",stringFormat,"0"}, - {SENSOR_NAME,"sensor_name","sensor_name",stringFormat,"-"}, - {DOMAIN_NAME,"domain_name","domain_name",stringFormat,"-"}, - /* {DOMAIN_ID,"domain_id","domain_id",numericFormat,"-"}, */ - {GROUP_NAME,"group_name","group_name",stringFormat,"-"}, - {GROUP_ID,"group_id","group_id",numericFormat,"-"}, - {TYPE,"type","type",stringFormat,"-"}, - {ACTION,"action","action",stringFormat,"-"}, - {SIG_GENERATOR,"sig_generator","sig_generator",numericFormat,"0"}, - {SIG_ID,"sig_id","sig_id",numericFormat,"0"}, - {SIG_REV,"sig_rev","rev",numericFormat,"0"}, - {PRIORITY,"priority","priority",stringFormat,"unknown"}, - {CLASSIFICATION,"classification","classification",stringFormat,"-"}, - {MSG,"msg","msg",stringFormat,"-"}, - {PAYLOAD,"payload","payload",stringFormat,"-"}, - {PROTO,"l4_proto_name","l4_proto_name",stringFormat,"-"}, - {PROTO_ID,"l4_proto","l4_proto",numericFormat,"0"}, - {ETHSRC,"ethsrc","ethsrc",stringFormat,"-"}, - {ETHDST,"ethdst","ethdst",stringFormat,"-"}, -#ifdef HAVE_RB_MAC_VENDORS - {ETHSRC_VENDOR,"ethsrc_vendor","ethsrc_vendor",stringFormat,"-"}, - {ETHDST_VENDOR,"ethdst_vendor","ethdst_vendor",stringFormat,"-"}, -#endif - {ETHTYPE,"ethtype","ethtype",numericFormat,"0"}, - {ARP_HW_SADDR,"arp_hw_saddr","arp_hw_saddr",stringFormat,"-"}, - {ARP_HW_SPROT,"arp_hw_sprot","arp_hw_sprot",stringFormat,"-"}, - {ARP_HW_TADDR,"arp_hw_taddr","arp_hw_taddr",stringFormat,"-"}, - {ARP_HW_TPROT,"arp_hw_tprot","arp_hw_tprot",stringFormat,"-"}, - {VLAN,"vlan","vlan",numericFormat,"0"}, - {VLAN_NAME,"vlan_name","vlan_name",stringFormat,"0"}, - {VLAN_PRIORITY,"vlan_priority","vlan_priority",numericFormat,"0"}, - {VLAN_DROP,"vlan_drop","vlan_drop",numericFormat,"0"}, - {UDPLENGTH,"udplength","udplength",numericFormat,"0"}, - {ETHLENGTH,"ethlen","ethlength",numericFormat,"0"}, - {ETHLENGTH_RANGE,"ethlength_range","ethlength_range",stringFormat,"0"}, - {TRHEADER,"trheader","trheader",stringFormat,"-"}, - {SRCPORT,"l4_srcport","src_port",numericFormat,"0"}, - {SRCPORT_NAME,"l4_srcport_name","src_port_name",stringFormat,"-"}, - {DSTPORT,"l4_dstport","dst_port",numericFormat,"0"}, - {DSTPORT_NAME,"l4_dstport_name","dst_port_name",stringFormat,"-"}, - {SRC_TEMPLATE_ID,"src_asnum","src_asnum",numericFormat,"0"}, - {SRC_STR,"src","src",stringFormat,"-"}, - {SRC_NAME,"src_name","src_name",stringFormat,"-"}, - {SRC_NET,"src_net","src_net",stringFormat,"0.0.0.0/0"}, - {SRC_NET_NAME,"src_net_name","src_net_name",stringFormat,"0.0.0.0/0"}, - {DST_TEMPLATE_ID,"dst_asnum","dst_asnum",stringFormat,"0"}, - {DST_NAME,"dst_name","dst_name",stringFormat,"-"}, - {DST_STR,"dst","dst",stringFormat,"-"}, - {DST_NET,"dst_net","dst_net",stringFormat,"0.0.0.0/0"}, - {DST_NET_NAME,"dst_net_name","dst_net_name",stringFormat,"0.0.0.0/0"}, - {ICMPTYPE,"icmptype","icmptype",numericFormat,"0"}, - {ICMPCODE,"icmpcode","icmpcode",numericFormat,"0"}, - {ICMPID,"icmpid","icmpid",numericFormat,"0"}, - {ICMPSEQ,"icmpseq","icmpseq",numericFormat,"0"}, - {TTL,"ttl","ttl",numericFormat,"0"}, - {TOS,"tos","tos",numericFormat,"0"}, - {ID,"id","id",numericFormat,"0"}, - {IPLEN,"iplen","iplen",numericFormat,"0"}, - {IPLEN_RANGE,"iplen_range","iplen_range",stringFormat,"0"}, - {DGMLEN,"dgmlen","dgmlen",numericFormat,"0"}, - {TCPSEQ,"tcpseq","tcpseq",numericFormat,"0"}, - {TCPACK,"tcpack","tcpack",numericFormat,"0"}, - {TCPLEN,"tcplen","tcplen",numericFormat,"0"}, - {TCPWINDOW,"tcpwindow","tcpwindow",numericFormat,"0"}, - {TCPFLAGS,"tcpflags","tcpflags",stringFormat,"-"}, - #ifdef HAVE_GEOIP - {SRC_COUNTRY,"src_country","src_country",stringFormat,"N/A"}, - {DST_COUNTRY,"dst_country","dst_country",stringFormat,"N/A"}, - {SRC_COUNTRY_CODE,"src_country_code","src_country_code",stringFormat,"N/A"}, - {DST_COUNTRY_CODE,"dst_country_code","dst_country_code",stringFormat,"N/A"}, - {SRC_AS,"src_as","src_as",numericFormat, 0}, - {DST_AS,"dst_as","dst_as",numericFormat, 0}, - {SRC_AS_NAME,"src_as_name","src_as_name",stringFormat,"N/A"}, - {DST_AS_NAME,"dst_as_name","dst_as_name",stringFormat,"N/A"}, - #endif /* HAVE_GEOIP */ - {TEMPLATE_END_ID,"","",numericFormat,"0"} + #define _X(a,b,c,d,e) {a,b,c,d,e}, + X_FUNCTION_TEMPLATE + #undef _X }; /* list of function prototypes for this preprocessor */ From e512180e0ea06a2812caae10b0248061fd13be64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 18 May 2015 12:13:48 +0000 Subject: [PATCH 141/198] Added enrich_with output json parameter. Deleted a few deprecated parameters because they can be included in enruch_with --- src/output-plugins/spo_alert_json.c | 96 ++++++++--------------------- 1 file changed, 27 insertions(+), 69 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index d834e58..b68209d 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -88,12 +88,13 @@ #include "math.h" +static const size_t initial_enrich_with_buf_len = 1024; // Send object_name or not. // Note: Always including ,sensor_name,domain_name,group_name,src_net_name,src_as_name,dst_net_name,dst_as_name //#define SEND_NAMES -#define DEFAULT_JSON_0 "timestamp,sensor_id,type,sensor_name,sensor_ip,domain_name,group_name,group_id,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" +#define DEFAULT_JSON_0 "timestamp,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" #ifdef HAVE_GEOIP #define DEFAULT_JSON_1 DEFAULT_JSON_0 ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ @@ -143,13 +144,6 @@ #define X_FUNCTION_TEMPLATE \ _X(TIMESTAMP,"timestamp","timestamp",numericFormat,"0") \ _X(SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat,"0") \ - _X(SENSOR_ID,"sensor_id","sensor_id",numericFormat,"0") \ - _X(SENSOR_IP,"sensor_ip","sensor_ip",stringFormat,"0") \ - _X(SENSOR_NAME,"sensor_name","sensor_name",stringFormat,"-") \ - _X(DOMAIN_NAME,"domain_name","domain_name",stringFormat,"-") \ - _X(DOMAIN_ID,"domain_id","domain_id",numericFormat,"-") \ - _X(GROUP_NAME,"group_name","group_name",stringFormat,"-") \ - _X(GROUP_ID,"group_id","group_id",numericFormat,"-") \ _X(TYPE,"type","type",stringFormat,"-") \ _X(ACTION,"action","action",stringFormat,"-") \ _X(SIG_GENERATOR,"sig_generator","sig_generator",numericFormat,"0") \ @@ -243,8 +237,7 @@ typedef struct _AlertJSONData TemplateElementsList * outputTemplate; AlertJSONConfig *config; Number_str_assoc * hosts, *nets, *services, *protocols, *vlans; - uint32_t sensor_id,domain_id,group_id; - char * sensor_name, *sensor_type,*domain,*sensor_ip,*group_name; + char *enrich_with; #ifdef HAVE_GEOIP GeoIP *gi,*gi_org; #ifdef SUP_IP6 @@ -382,7 +375,7 @@ rdkafka_add_str_to_config(rd_kafka_conf_t *rk_conf, rd_kafka_topic_conf_t *rkt_c * Function: ParseJSONArgs(char *) * * Purpose: Process positional args, if any. Syntax is: - * output alert_json: [ ["default"| [sensor_name=name] [sensor_id=id]] + * output alert_json: [ ["default"|]] * list ::= (,)* * field ::= "dst"|"src"|"ttl" ... * name ::= sensor name @@ -445,29 +438,21 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { RB_IF_CLEAN(data->jsonargs,data->jsonargs = SnortStrdup(DEFAULT_JSON),"%s(%i) param setted twice\n",tok,i); } - else if(!strncasecmp(tok,"sensor_name=",strlen("sensor_name=")) && !data->sensor_name) + else if(!strncasecmp(tok,"enrich_with=",strlen("enrich_with="))) { - RB_IF_CLEAN(data->sensor_name,data->sensor_name = SnortStrdup(tok+strlen("sensor_name=")),"%s(%i) param setted twice\n",tok,i); - } - else if(!strncasecmp(tok,"sensor_id=",strlen("sensor_id="))) - { - data->sensor_id = atol(tok + strlen("sensor_id=")); - } - else if(!strncasecmp(tok,"sensor_ip=",strlen("sensor_ip="))) - { - data->sensor_ip = strdup(tok + strlen("sensor_ip=")); - } - else if(!strncasecmp(tok,"group_id=",strlen("group_id="))) - { - data->group_id = atol(tok + strlen("group_id=")); - } - else if(!strncasecmp(tok,"group_name=",strlen("group_name="))) - { - data->group_name = strdup(tok + strlen("group_name=")); - } - else if(!strncasecmp(tok,"sensor_type=",strlen("sensor_type="))) - { - RB_IF_CLEAN(data->sensor_type,data->sensor_type = SnortStrdup(tok + strlen("sensor_type=")),"%s(%i) param setted twice.\n",tok,i); + RB_IF_CLEAN(data->enrich_with,data->enrich_with = SnortStrdup(tok+strlen("enrich_with=")),"%s(%i) param setted twice\n",tok,i); + if( data->enrich_with[0]!='{' ) + { + FatalError("alert_json: enrich_with argument does not start with {"); + } + if( data->enrich_with[strlen(data->enrich_with)-1] != '}' ) + { + FatalError("alert_json: enrich_with argument does not end with }"); + } + /* More convenience to enrich */ + data->enrich_with[0] = ','; + data->enrich_with[strlen(data->enrich_with)-1] = '\0'; + } else if(!strncasecmp(tok,"hosts=",strlen("hosts="))) { @@ -511,10 +496,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { RB_IF_CLEAN(eth_vendors_path,eth_vendors_path = SnortStrdup(tok+strlen("eth_vendors=")),"%s(%i) param setted twice.\n",tok,i); } - else if(!strncasecmp(tok,"domain_name=",strlen("domain_name="))) - { - RB_IF_CLEAN(data->domain, data->domain = SnortStrdup(tok+strlen("domain_name=")),"%s(%i) param setted twice.\n",tok,i); - } #ifdef HAVE_GEOIP else if(!strncasecmp(tok,"geoip=",strlen("geoip="))) { @@ -550,7 +531,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) /* DFEFAULT VALUES */ if ( !data->jsonargs ) data->jsonargs = SnortStrdup(DEFAULT_JSON); - if ( !data->sensor_name ) data->sensor_name = SnortStrdup("-"); if ( !filename ) filename = ProcessFileOption(barnyard2_conf_for_parsing, DEFAULT_FILE); if ( !kafka_str ) kafka_str = SnortStrdup(DEFAULT_KAFKA_BROKER); @@ -696,11 +676,6 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) if(data->kafka) KafkaLog_Term(data->kafka); free(data->jsonargs); - free(data->sensor_name); - free(data->sensor_ip); - free(data->sensor_type); - free(data->group_name); - free(data->domain); freeNumberStrAssocList(data->hosts); freeNumberStrAssocList(data->nets); freeNumberStrAssocList(data->services); @@ -1209,30 +1184,6 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case SENSOR_ID_SNORT: KafkaLog_Puts(kafka,event?itoa10(ntohl(((Unified2EventCommon *)event)->sensor_id),buf, bufLen):templateElement->defaultValue); break; - case SENSOR_ID: - KafkaLog_Puts(kafka,itoa10(jsonData->sensor_id,buf,bufLen)); - break; - case SENSOR_IP: - if(jsonData->sensor_ip) KafkaLog_Puts(kafka,jsonData->sensor_ip); - break; - case SENSOR_NAME: - KafkaLog_Puts(kafka,jsonData->sensor_name); - break; - case DOMAIN_NAME: - if(jsonData->domain) KafkaLog_Puts(kafka,jsonData->domain); - break; - case DOMAIN_ID: - KafkaLog_Puts(kafka,itoa10(jsonData->domain_id,buf,bufLen)); - break; - case GROUP_NAME: - if(jsonData->group_name) KafkaLog_Puts(kafka,jsonData->group_name); - break; - case GROUP_ID: - KafkaLog_Puts(kafka,itoa10(jsonData->group_id,buf,bufLen)); - break; - case TYPE: - if(jsonData->sensor_type) KafkaLog_Puts(kafka,jsonData->sensor_type); - break; case ACTION: if((str_aux = actionOfEvent(event,event_type))) KafkaLog_Puts(kafka,str_aux); @@ -1710,7 +1661,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging JSON Alert data\n");); KafkaLog_Putc(kafka,'{'); - for(iter=jsonData->outputTemplate;iter;iter=iter->next){ + for(iter=jsonData->outputTemplate;iter;iter=iter->next) + { const int initial_pos = KafkaLog_Tell(kafka); if(iter!=jsonData->outputTemplate) KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); @@ -1725,7 +1677,8 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO if(iter->templateElement->printFormat==stringFormat) KafkaLog_Putc(kafka,'"'); - if(0==writed){ + if(0==writed) + { #ifdef HAVE_LIBRDKAFKA kafka->pos = initial_pos; // Revert the insertion of empty element */ #endif @@ -1735,6 +1688,11 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO } } + if(jsonData->enrich_with) + { + KafkaLog_Puts(kafka,jsonData->enrich_with); + } + KafkaLog_Putc(kafka,'}'); // Just for debug DEBUG_WRAP(DebugMessage(DEBUG_LOG,"[KAFKA]: %s",kafka->buf);); From 21edda42a5066ed781b7242f5296f5577f5c693c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 18 May 2015 14:56:12 +0000 Subject: [PATCH 142/198] Added KafkaLog_FlushAll in order to flush all messages when barnyard2 exists --- src/output-plugins/spo_alert_json.c | 5 ++++- src/rbutil/rb_kafka.c | 13 +++++++++++++ src/rbutil/rb_kafka.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index b68209d..0e75337 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -315,6 +315,7 @@ static void AlertJSONInit(char *args) /* Set the preprocessor function into the function list */ AddFuncToOutputList(AlertJSON, OUTPUT_TYPE__ALERT, data); AddFuncToCleanExitList(AlertJSONCleanExit, data); + AddFuncToShutdownList(AlertJSONCleanExit, data); AddFuncToRestartList(AlertRestart, data); } @@ -673,8 +674,10 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) if(data) { - if(data->kafka) + if(data->kafka){ + KafkaLog_FlushAll(data->kafka); KafkaLog_Term(data->kafka); + } free(data->jsonargs); freeNumberStrAssocList(data->hosts); freeNumberStrAssocList(data->nets); diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c index 0dcfb9e..b5bf35d 100644 --- a/src/rbutil/rb_kafka.c +++ b/src/rbutil/rb_kafka.c @@ -259,6 +259,19 @@ bool KafkaLog_Flush(KafkaLog* this) return TRUE; } +bool KafkaLog_FlushAll(KafkaLog* this) +{ +#if HAVE_LIBRDKAFKA + while (rd_kafka_outq_len(this->handler) > 0) + rd_kafka_poll(this->handler, 100); +#endif /* HAVE_LIBRDKAFKA */ + + if(this->textLog) TextLog_Flush(this->textLog); + + KafkaLog_Reset(this); + return TRUE; +} + /*------------------------------------------------------------------- * KafkaLog_Putc: append char to buffer *------------------------------------------------------------------- diff --git a/src/rbutil/rb_kafka.h b/src/rbutil/rb_kafka.h index c11572d..381aba1 100644 --- a/src/rbutil/rb_kafka.h +++ b/src/rbutil/rb_kafka.h @@ -102,6 +102,7 @@ bool KafkaLog_Write(KafkaLog*, const char*, int len); bool KafkaLog_Print(KafkaLog*, const char* format, ...); bool KafkaLog_Flush(KafkaLog*); +bool KafkaLog_FlushAll(KafkaLog*); /*------------------------------------------------------------------- * helper functions From 2238c7ef872c7b02b924e76c4323b0b937d12e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 18 May 2015 15:04:06 +0000 Subject: [PATCH 143/198] Cleaning GeoIP databases --- src/output-plugins/spo_alert_json.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 0e75337..d19aab7 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -678,6 +678,16 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) KafkaLog_FlushAll(data->kafka); KafkaLog_Term(data->kafka); } + + if(data->gi) + GeoIP_delete(data->gi); + if(data->gi_org) + GeoIP_delete(data->gi_org); + if(data->gi6) + GeoIP_delete(data->gi6); + if(data->gi6_org) + GeoIP_delete(data->gi6_org); + free(data->jsonargs); freeNumberStrAssocList(data->hosts); freeNumberStrAssocList(data->nets); From 7ce4263ff3c5fe68c500937cec3489f644e92a84 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Fri, 22 May 2015 08:18:48 +0000 Subject: [PATCH 144/198] Fixing .gitignore file --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 01fef8c..2ce9174 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 -Makefileq +Makefile missing src/barnyard2 src/input-plugins/libspi.a From 09c1d96ce57590b98c478350187de3d3d4de2e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Wed, 1 Jul 2015 06:13:30 +0000 Subject: [PATCH 145/198] Updated .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d253bf0..c77e6c5 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ src/output-plugins/libspo.a src/sfutil/libsfutil.a src/rbutil/librbutil.a stamp-h1 +*Makefile.in From 609383da9bf450219480984ec87b25b8f18b2815 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Fri, 10 Jul 2015 11:33:24 +0000 Subject: [PATCH 146/198] SMTP ExtraData fields included --- src/output-plugins/spo_alert_json.c | 38 ++++++++++++++++++++++++++--- src/unified2.h | 11 ++++++--- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 0050077..12c8d30 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -133,12 +133,15 @@ static const size_t initial_enrich_with_buf_len = 1024; #endif #ifdef RB_EXTRADATA -#define FIELDS_EXTRADATA ",sha256,file_size,file_hostname,file_uri" +#define FIELDS_EXTRADATA ",sha256,file_size,file_hostname,file_uri,email_sender,email_destinations" //email_headers not included #define X_RB_EXTRADATA \ _X(SHA256,"sha256","sha256",stringFormat,"-") \ _X(FILE_SIZE,"file_size","file_size",stringFormat,"-") \ _X(FILE_HOSTNAME,"file_hostname","file_hostname",stringFormat,"-") \ - _X(FILE_URI,"file_uri","file_uri",stringFormat,"-") + _X(FILE_URI,"file_uri","file_uri",stringFormat,"-") \ + _X(EMAIL_SENDER,"email_sender","email_sender",stringFormat,"-") \ + _X(EMAIL_DESTINATIONS,"email_destinations","email_destinations",stringFormat,"-") + //_X(EMAIL_HEADERS,"email_headers","email_headers",stringFormat,"-") #else #define FIELDS_EXTRADATA #define X_RB_EXTRADATA @@ -1190,7 +1193,7 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, } break; case FILE_URI: - if (event_info == EVENT_INFO_FILE_URI) + if (event_info == EVENT_INFO_FILE_NAME) { str = (char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); @@ -1205,6 +1208,32 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, KafkaLog_Write(kafka, str, len); } break; + case EMAIL_SENDER: + if (event_info == EVENT_INFO_FILE_MAILFROM) + { + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + KafkaLog_Write(kafka, str, len); + } + break; + case EMAIL_DESTINATIONS: + if (event_info == EVENT_INFO_FILE_RCPTTO) + { + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + KafkaLog_Write(kafka, str, len); + } + break; + /* + case EMAIL_HEADERS: + if (event_info == EVENT_INFO_FILE_MAILHEADERS) + { + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + KafkaLog_Write(kafka, str, len); + } + break; + */ default: LogMessage("WARNING: printElementExtraDataBlob(): JSON Element ID inconsistent (%d)\n", templateElement->id); break; @@ -1381,6 +1410,9 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case FILE_SIZE: case FILE_URI: case FILE_HOSTNAME: + case EMAIL_SENDER: + case EMAIL_DESTINATIONS: + //case EMAIL_HEADERS: if (event != NULL) printElementExtraData(event, event_type, templateElement, kafka); break; diff --git a/src/unified2.h b/src/unified2.h index 73b65b3..915d98e 100644 --- a/src/unified2.h +++ b/src/unified2.h @@ -185,10 +185,13 @@ typedef enum _EventInfoEnum EVENT_INFO_IPV6_SRC, EVENT_INFO_IPV6_DST, EVENT_INFO_JSNORM_DATA, - EVENT_INFO_FILE_SHA256, - EVENT_INFO_FILE_SIZE, - EVENT_INFO_FILE_URI, - EVENT_INFO_FILE_HOSTNAME + EVENT_INFO_FILE_SHA256, /* 14 */ + EVENT_INFO_FILE_SIZE, /* 15 */ + EVENT_INFO_FILE_NAME, /* 16 */ + EVENT_INFO_FILE_HOSTNAME, /* 17 */ + EVENT_INFO_FILE_MAILFROM, /* 18 */ + EVENT_INFO_FILE_RCPTTO, /* 19 */ + EVENT_INFO_FILE_EMAIL_HDRS /* 20 */ #else EVENT_INFO_GZIP_DATA #endif From f6ed4946c5b124cc6e8561c401aee0a12d4cf1cb Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Mon, 13 Jul 2015 10:27:17 +0000 Subject: [PATCH 147/198] FIX: Last event discarded when opening a new snort.log file (redmine issue #4834) --- src/spooler.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/spooler.c b/src/spooler.c index 8a4d674..0423620 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -639,6 +639,9 @@ int ProcessContinuous(const char *dirpath, const char *filebase, ArchiveFile(spooler->filepath, BcArchiveDir()); /* close (ie. destroy and cleanup) the spooler so we can rotate */ +#ifdef RB_EXTRADATA + spoolerFireLastEvent(spooler); +#endif UnRegisterSpooler(spooler); spoolerClose(spooler); spooler = NULL; From 827163203a9d7334c43ac9550313c5b067eafdea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Tue, 29 Sep 2015 09:28:37 +0000 Subject: [PATCH 148/198] Adding rbhttp library in the configure flags --- configure.in | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/configure.in b/configure.in index 6954bc4..eac5d72 100644 --- a/configure.in +++ b/configure.in @@ -247,6 +247,26 @@ if test "x$enable_kafka" = "x$enableval"; then LDFLAGS="${LDFLAGS} -lrdkafka" fi +AC_ARG_ENABLE(rb-http, +[ --enable-rb-http Enable HTTP POST json sending.], + enable_rbhttp="$enableval", enable_rbhttp="no") + +if test "x$enable_rbhttp" = "x$enableval"; then + AC_CHECK_HEADERS([librbhttp/librb-http.h],[], + [ + echo "Error: redBorder HTTP headers not found." + exit 1 + ]) + + AC_CHECK_LIB(rbhttp,rb_http_produce,[], + [ + echo "Error: redBorder HTTP library not found." + exit 1 + ]) + + LDFLAGS="${LDFLAGS} -lrbhttp" +fi + AC_ARG_WITH(rd_includes, [ --with-rd-includes=DIR rd include directory], [with_rd_includes="$withval"],[with_rd_includes="no"]) From d6548f648b71e9b49e7ab67797291582de93f93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Wed, 30 Sep 2015 11:37:46 +0000 Subject: [PATCH 149/198] Deleted rb_kafka.{c,h}, since they did too many stuffs. Preparing for HTTP sends --- src/output-plugins/spo_alert_json.c | 437 ++++++++++++++++++---------- src/rbutil/Makefile.am | 2 +- src/rbutil/rb_kafka.c | 419 -------------------------- src/rbutil/rb_kafka.h | 150 ---------- src/rbutil/rb_printbuf.c | 169 +++++++++++ src/rbutil/rb_printbuf.h | 90 ++++++ 6 files changed, 549 insertions(+), 718 deletions(-) delete mode 100644 src/rbutil/rb_kafka.c delete mode 100644 src/rbutil/rb_kafka.h create mode 100644 src/rbutil/rb_printbuf.c create mode 100644 src/rbutil/rb_printbuf.h diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 12c8d30..05e0496 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -66,7 +66,6 @@ #include "barnyard2.h" #include "sfutil/sf_textlog.h" -#include "rbutil/rb_kafka.h" #include "rbutil/rb_numstrpair_list.h" #include "rbutil/rb_pointers.h" #include "rbutil/rb_unified2.h" @@ -82,10 +81,13 @@ #include "GeoIP.h" #endif // HAVE_GEOIP -#ifdef HAVE_LIBRD -#include "librd/rd.h" +#ifdef HAVE_LIBRDKAFKA +#include #endif +#include +#include + #include "math.h" static const size_t initial_enrich_with_buf_len = 1024; @@ -252,9 +254,26 @@ typedef struct _AlertJSONConfig{ struct _AlertJSONConfig *next; } AlertJSONConfig; +static const uint64_t RPRINTBUF_MAGIC = 0x1ba1c1ba1c1ba1c; + +typedef struct _RefcntPrintbuf { + DEBUG_WRAP(uint64_t magic;); + struct printbuf printbuf; + int refcnt; +} RefcntPrintbuf; + +static void DecRefcntPrintbuf(RefcntPrintbuf *rprintbuf) { + if(rd_atomic_sub(&rprintbuf->refcnt,1) == 0) { + /* No more users, let's free */ + free(rprintbuf->printbuf.buf); + DEBUG_WRAP(memset(rprintbuf,0,sizeof(rprintbuf))); + free(rprintbuf); + } +} + typedef struct _AlertJSONData { - KafkaLog * kafka; + RefcntPrintbuf *curr_printbuf; char * jsonargs; TemplateElementsList * outputTemplate; AlertJSONConfig *config; @@ -269,6 +288,15 @@ typedef struct _AlertJSONData #ifdef HAVE_RB_MAC_VENDORS struct mac_vendor_database *eth_vendors_db; #endif +#ifdef HAVE_LIBRDKAFKA + struct { + char *brokers,*topic; + rd_kafka_t *rk; + rd_kafka_conf_t *rk_conf; + rd_kafka_topic_t *rkt; + rd_kafka_topic_conf_t *rkt_conf; + } kafka; +#endif } AlertJSONData; static const char *priority_name[] = {NULL, "high", "medium", "low", "very low"}; @@ -280,6 +308,7 @@ static AlertJSONTemplateElement template[] = { #undef _X }; + /* list of function prototypes for this preprocessor */ static void AlertJSONInit(char *); static AlertJSONData *AlertJSONParseArgs(char *); @@ -287,6 +316,13 @@ static void AlertJSON(Packet *, void *, uint32_t, void *); static void AlertJSONCleanExit(int, void *); static void AlertRestart(int, void *); static void RealAlertJSON(Packet*, void*, uint32_t, AlertJSONData * data); +#ifdef HAVE_LIBRDKAFKA +static void AlertJsonKafkaDelayedInit (AlertJSONData *this); +static void KafkaMsgDelivered (rd_kafka_t *rk, + void *payload, size_t len, + int error_code, + void *opaque, void *msg_opaque); +#endif /* * Function: SetupJSON() @@ -373,7 +409,7 @@ static rd_kafka_conf_res_t rdkafka_add_str_to_config(rd_kafka_conf_t *rk_conf, rd_kafka_topic_conf_t *rkt_conf, const char *_keyval, char *errstr,size_t errstr_size){ - char *keyval = strdup(_keyval); + char *keyval = SnortStrdup(_keyval); const char *key = keyval; char *val = strchr(keyval,'='); @@ -413,7 +449,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) int num_toks; AlertJSONData *data; char* filename = NULL; - char* kafka_str = NULL; int i; char* hostsListPath = NULL,*networksPath = NULL,*servicesPath = NULL,*protocolsPath = NULL,*vlansPath=NULL,*prioritiesPath=NULL; #ifdef HAVE_GEOIP @@ -427,10 +462,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) #ifdef HAVE_RB_MAC_VENDORS char * eth_vendors_path = NULL; #endif - #ifdef HAVE_LIBRDKAFKA - rd_kafka_conf_t *rk_conf = rd_kafka_conf_new(); - rd_kafka_topic_conf_t *rkt_conf = rd_kafka_topic_conf_new(); - #endif DEBUG_WRAP(DebugMessage(DEBUG_INIT, "ParseJSONArgs: %s\n", args);); data = (AlertJSONData *)SnortAlloc(sizeof(AlertJSONData)); @@ -442,6 +473,12 @@ static AlertJSONData *AlertJSONParseArgs(char *args) if ( !args ) args = ""; toks = mSplit((char *)args, " \t", 0, &num_toks, '\\'); +#ifdef HAVE_LIBRDKAFKA + char* kafka_str = NULL; + data->kafka.rk_conf = rd_kafka_conf_new(); + data->kafka.rkt_conf = rd_kafka_topic_conf_new(); +#endif + for (i = 0; i < num_toks; i++) { const char* tok = toks[i]; @@ -455,7 +492,11 @@ static AlertJSONData *AlertJSONParseArgs(char *args) } else if(!strncasecmp(tok, KAFKA_PROT,strlen(KAFKA_PROT)) && !kafka_str) { +#ifdef HAVE_LIBRDKAFKA RB_IF_CLEAN(kafka_str,kafka_str = SnortStrdup(tok),"%s(%i) param setted twice\n",tok,i); +#else + FatalError("alert_json: This barnyard was build with no librdkafka support."); +#endif } else if ( !strncasecmp(tok, "default", strlen("default")) && !data->jsonargs) { @@ -505,7 +546,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) #if HAVE_LIBRDKAFKA char errstr[512]; - const rd_kafka_conf_res_t rc = rdkafka_add_str_to_config(rk_conf,rkt_conf,tok+strlen("rdkafka."),errstr,sizeof(errstr)); + const rd_kafka_conf_res_t rc = rdkafka_add_str_to_config(data->kafka.rk_conf,data->kafka.rkt_conf,tok+strlen("rdkafka."),errstr,sizeof(errstr)); if(rc != RD_KAFKA_CONF_OK){ FatalError("alert_json: Cannot parse %s(%i): %s: %s\n", file_name, file_line, tok,errstr); @@ -547,8 +588,8 @@ static AlertJSONData *AlertJSONParseArgs(char *args) #endif else { - FatalError("alert_json: Cannot parse %s(%i): %s\n", - file_name, file_line, tok); + FatalError("alert_json: Cannot parse %s(%i): %s\n", + file_name, file_line, tok); } } @@ -651,27 +692,28 @@ static AlertJSONData *AlertJSONParseArgs(char *args) DEBUG_INIT, "alert_json: '%s' '%s'\n", filename, data->jsonargs );); +#ifdef HAVE_LIBRDKAFKA if(kafka_str){ + /// @TODO this should be cleaned. char * at_char = strchr(kafka_str,BROKER_TOPIC_SEPARATOR); if(at_char==NULL) FatalError("alert_json: No topic specified, despite the fact a kafka server was given. Use kafka://broker@topic."); const size_t broker_length = (at_char-(kafka_str+strlen(KAFKA_PROT))); - char * kafka_server = malloc(sizeof(char)*(broker_length+1)); - strncpy(kafka_server,kafka_str+strlen(KAFKA_PROT),broker_length); - kafka_server[broker_length] = '\0'; + data->kafka.brokers = SnortAlloc(broker_length+1); + strncpy(data->kafka.brokers,kafka_str+strlen(KAFKA_PROT),broker_length); + data->kafka.brokers[broker_length] = '\0'; + data->kafka.topic = SnortStrdup(at_char+1); /* * In DaemonMode(), kafka must start in another function, because, in daemon mode, Barnyard2Main will execute this * function, will do a fork() and then, in the child process, will call RealAlertJSON, that will not be able to - * send kafka data*/ - data->kafka = KafkaLog_Init (kafka_server, LOG_BUFFER, at_char+1, kafka_str?NULL:filename - #ifdef HAVE_LIBRDKAFKA - ,rk_conf,rkt_conf - #endif - ); + * send kafka data */ + + free(kafka_str); } +#endif + if ( filename ) free(filename); - if( kafka_str ) free (kafka_str); if( hostsListPath ) free (hostsListPath); if( networksPath ) free (networksPath); if( servicesPath ) free (servicesPath); @@ -687,6 +729,53 @@ static AlertJSONData *AlertJSONParseArgs(char *args) return data; } +#ifdef HAVE_LIBRDKAFKA +static void KafkaMsgDelivered (rd_kafka_t *rk, + void *payload, size_t len, + int error_code, + void *opaque, void *msg_opaque) +{ + RefcntPrintbuf *rprintbuf = msg_opaque; + + DEBUG_WRAP(if(RPRINTBUF_MAGIC!=rprintbuf->magic) + FatalError("msg_delivered:Not valid magic")); + + if (unlikely(error_code)) + ErrorMessage("rdkafka Message delivery failed: %s\n",rd_kafka_err2str(error_code)); + else if (unlikely(BcLogVerbose())) + LogMessage("rdkafka Message delivered (%zd bytes)\n", len); + + DecRefcntPrintbuf(rprintbuf); +} + +static void AlertJsonKafkaDelayedInit (AlertJSONData *this) +{ + char errstr[256]; + + if(!this->kafka.rk_conf) + FatalError("%s called with NULL==this->rk_conf\n", + __FUNCTION__); + + if(!this->kafka.rkt_conf) + FatalError("%s called with NULL==this->rkt_conf\n", + __FUNCTION__); + + rd_kafka_conf_set_dr_cb(this->kafka.rk_conf,KafkaMsgDelivered); + this->kafka.rk = rd_kafka_new(RD_KAFKA_PRODUCER, this->kafka.rk_conf, errstr, sizeof(errstr)); + + if(NULL==this->kafka.rk) + FatalError("Failed to create new producer: %s\n",errstr); + + if (rd_kafka_brokers_add(this->kafka.rk, this->kafka.brokers) == 0) + FatalError("Kafka: No valid brokers specified in %s\n",this->kafka.brokers); + + this->kafka.rkt = rd_kafka_topic_new(this->kafka.rk, this->kafka.topic, this->kafka.rkt_conf); + + if(NULL==this->kafka.rkt) + FatalError("It was not possible create a kafka topic %s\n",this->kafka.topic); +} +#endif + static void AlertJSONCleanup(int signal, void *arg, const char* msg) { AlertJSONData *data = (AlertJSONData *)arg; @@ -696,10 +785,25 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) if(data) { - if(data->kafka){ - KafkaLog_FlushAll(data->kafka); - KafkaLog_Term(data->kafka); +#ifdef HAVE_LIBRDKAFKA + if(data->kafka.rk) + { + while (rd_kafka_outq_len(data->kafka.rk) > 0) + { + rd_kafka_poll(data->kafka.rk, 100); + } + + if(data->kafka.rkt) + { + // @TODO + // rdkafka_topic_destroy(data->kafka.rkt); + } + + rd_kafka_destroy(data->kafka.rk); + // @TODO + // rd_kafka_wait_destroyed(); } +#endif if(data->gi) GeoIP_delete(data->gi); @@ -791,14 +895,16 @@ static inline char *itoa16(uint64_t value,char *result,const size_t bufsize){ return ret; } -static inline void printHWaddr(KafkaLog *kafka,const uint8_t *addr,char * buf,const size_t bufLen){ +static inline void printHWaddr(struct printbuf *pbuf,const uint8_t *addr,char * buf,const size_t bufLen){ int i; - for(i=0;i<6;++i){ + for(i=0;i<6;++i) + { if(i>0) - KafkaLog_Putc(kafka,':'); - if(addr[i]<0x10) - KafkaLog_Putc(kafka,'0'); - KafkaLog_Puts(kafka, itoa16(addr[i],buf,bufLen)); + { + printbuf_memappend_fast_str(pbuf,":"); + } + + printbuf_memappend_fast_n16(pbuf,addr[i]); } } @@ -1158,7 +1264,8 @@ static char *extract_AS(AlertJSONData *jsonData,const sfip_t *ip) #endif #ifdef RB_EXTRADATA -static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, KafkaLog *kafka, Unified2ExtraData *U2ExtraData) +static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, + struct printbuf *printbuf, Unified2ExtraData *U2ExtraData) { uint32_t event_info; /* type in Unified2 Event */ const char *str; @@ -1179,9 +1286,9 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, const size_t bufLen = sizeof buf; if(sha_str && len>0) for(i=0; idefaultValue); + printbuf_memappend_fast_str(printbuf, templateElement->defaultValue); } break; case FILE_SIZE: @@ -1189,7 +1296,7 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, { str = (char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - KafkaLog_Write(kafka, str, len); + printbuf_memappend_fast(printbuf, str, len); } break; case FILE_URI: @@ -1197,7 +1304,7 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, { str = (char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - KafkaLog_Write(kafka, str, len); + printbuf_memappend_fast(printbuf, str, len); } break; case FILE_HOSTNAME: @@ -1205,7 +1312,7 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, { str = (char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - KafkaLog_Write(kafka, str, len); + printbuf_memappend_fast(printbuf, str, len); } break; case EMAIL_SENDER: @@ -1213,7 +1320,7 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, { str = (char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - KafkaLog_Write(kafka, str, len); + printbuf_memappend_fast(printbuf, str, len); } break; case EMAIL_DESTINATIONS: @@ -1221,7 +1328,7 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, { str = (char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - KafkaLog_Write(kafka, str, len); + printbuf_memappend_fast(printbuf, str, len); } break; /* @@ -1230,7 +1337,7 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, { str = (char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - KafkaLog_Write(kafka, str, len); + printbuf_memappend_fast(printbuf, str, len); } break; */ @@ -1242,7 +1349,8 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, return 0; } -static int printElementExtraData(void *event, uint32_t event_type, AlertJSONTemplateElement *templateElement, KafkaLog *kafka) +static int printElementExtraData(void *event, uint32_t event_type, + AlertJSONTemplateElement *templateElement, struct printbuf *printbuf) { uint32_t event_data_type; /* datatype in Unified2 Event*/ ExtraDataRecordNode *edrnCurrent = NULL; @@ -1280,7 +1388,7 @@ static int printElementExtraData(void *event, uint32_t event_type, AlertJSONTemp event_data_type = ntohl(U2ExtraData->data_type); if (event_data_type == EVENT_DATA_TYPE_BLOB) - printElementExtraDataBlob(templateElement, kafka, U2ExtraData); + printElementExtraDataBlob(templateElement, printbuf, U2ExtraData); } return 0; @@ -1300,17 +1408,19 @@ static int printElementExtraData(void *event, uint32_t event_type, AlertJSONTemp * Returns: 0 if nothing writed to jsonData. !=0 otherwise. * */ -static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement){ +static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, + AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement, + struct printbuf *printbuf) +{ SigNode *sn; char tcpFlags[9]; char buf[sizeof "0000:0000:0000:0000:0000:0000:0000:0000"]; const size_t bufLen = sizeof buf; const char * str_aux=NULL; - KafkaLog * kafka = jsonData->kafka; sfip_t ip; sfip_clear(&ip); - const int initial_buffer_pos = KafkaLog_Tell(jsonData->kafka); + const int initial_buffer_pos = printbuf->bpos; /* Avoid repeated code */ switch(templateElement->id){ @@ -1351,26 +1461,26 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, #endif switch(templateElement->id){ case TIMESTAMP: - KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->event_second), buf, bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(ntohl(((Unified2EventCommon *)event)->event_second), buf, bufLen)); break; case SENSOR_ID_SNORT: - KafkaLog_Puts(kafka,event?itoa10(ntohl(((Unified2EventCommon *)event)->sensor_id),buf, bufLen):templateElement->defaultValue); + printbuf_memappend_fast_str(printbuf,event?itoa10(ntohl(((Unified2EventCommon *)event)->sensor_id),buf, bufLen):templateElement->defaultValue); break; case ACTION: if((str_aux = actionOfEvent(event,event_type))) - KafkaLog_Puts(kafka,str_aux); + printbuf_memappend_fast_str(printbuf,str_aux); break; case SIG_GENERATOR: if(event != NULL) - KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->generator_id),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(ntohl(((Unified2EventCommon *)event)->generator_id),buf,bufLen)); break; case SIG_ID: if(event != NULL) - KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->signature_id),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(ntohl(((Unified2EventCommon *)event)->signature_id),buf,bufLen)); break; case SIG_REV: if(event != NULL) - KafkaLog_Puts(kafka,itoa10(ntohl(((Unified2EventCommon *)event)->signature_revision),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(ntohl(((Unified2EventCommon *)event)->signature_revision),buf,bufLen)); break; case PRIORITY: if(event != NULL){ @@ -1378,7 +1488,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, const char *prio_name = NULL; if(priority_id < sizeof(priority_name)/sizeof(priority_name[0])) prio_name = priority_name[priority_id]; - KafkaLog_Puts(kafka,prio_name ? prio_name : templateElement->defaultValue); + printbuf_memappend_fast_str(printbuf,prio_name ? prio_name : templateElement->defaultValue); } break; case CLASSIFICATION: @@ -1386,9 +1496,9 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, { uint32_t classification_id = ntohl(((Unified2EventCommon *)event)->classification_id); const ClassType *cn = ClassTypeLookupById(barnyard2_conf, classification_id); - KafkaLog_Puts(kafka,cn?cn->name:templateElement->defaultValue); + printbuf_memappend_fast_str(printbuf,cn?cn->name:templateElement->defaultValue); }else{ /* Always log something */ - KafkaLog_Puts(kafka, templateElement->defaultValue); + printbuf_memappend_fast_str(printbuf, templateElement->defaultValue); } break; case MSG: @@ -1401,7 +1511,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, if (sn != NULL) { //const int msglen = strlen(sn->msg); - KafkaLog_Puts(kafka,sn->msg); + printbuf_memappend_fast_str(printbuf,sn->msg); } } break; @@ -1414,7 +1524,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case EMAIL_DESTINATIONS: //case EMAIL_HEADERS: if (event != NULL) - printElementExtraData(event, event_type, templateElement, kafka); + printElementExtraData(event, event_type, templateElement, printbuf); break; #endif case PAYLOAD: @@ -1426,9 +1536,9 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, uint16_t i; if(p && p->dsize>0){ for(i=0;idsize;++i) - KafkaLog_Puts(kafka, itoa16(p->data[i],buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa16(p->data[i],buf,bufLen)); }else{ - KafkaLog_Puts(kafka, templateElement->defaultValue); + printbuf_memappend_fast_str(printbuf, templateElement->defaultValue); } } break; @@ -1438,7 +1548,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, const uint16_t proto = extract_proto(event,event_type,p); Number_str_assoc * service_name_asoc = SearchNumberStr(proto,jsonData->protocols); if(service_name_asoc){ - KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); + printbuf_memappend_fast_str(printbuf,service_name_asoc->human_readable_str); break; } } @@ -1446,19 +1556,19 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case PROTO_ID: { const uint16_t proto = extract_proto(event,event_type,p); - KafkaLog_Puts(kafka,itoa10(proto,buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(proto,buf,bufLen)); } break; case ETHSRC: if(p && p->eh) - printHWaddr(kafka, p->eh->ether_src, buf,bufLen); + printHWaddr(printbuf, p->eh->ether_src, buf,bufLen); break; case ETHDST: if(p && p->eh) - printHWaddr(kafka,p->eh->ether_dst,buf,bufLen); + printHWaddr(printbuf,p->eh->ether_dst,buf,bufLen); break; #ifdef HAVE_RB_MAC_VENDORS @@ -1467,7 +1577,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, { const char * vendor = rb_find_mac_vendor(HWADDR_vectoi(p->eh->ether_src),jsonData->eth_vendors_db); if(vendor) - KafkaLog_Puts(kafka,vendor); + printbuf_memappend_fast_str(printbuf,vendor); } break; case ETHDST_VENDOR: @@ -1475,107 +1585,107 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, { const char * vendor = rb_find_mac_vendor(HWADDR_vectoi(p->eh->ether_dst),jsonData->eth_vendors_db); if(vendor) - KafkaLog_Puts(kafka,vendor); + printbuf_memappend_fast_str(printbuf,vendor); } break; #endif case ARP_HW_SADDR: if(p && p->ah) - printHWaddr(kafka,p->ah->arp_sha,buf,bufLen); + printHWaddr(printbuf,p->ah->arp_sha,buf,bufLen); break; case ARP_HW_SPROT: if(p && p->ah) { - KafkaLog_Puts(kafka, "0x"); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[0],buf,bufLen)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[1],buf,bufLen)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[2],buf,bufLen)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_spa[3],buf,bufLen)); + printbuf_memappend_fast_str(printbuf, "0x"); + printbuf_memappend_fast_str(printbuf, itoa16(p->ah->arp_spa[0],buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa16(p->ah->arp_spa[1],buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa16(p->ah->arp_spa[2],buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa16(p->ah->arp_spa[3],buf,bufLen)); } break; case ARP_HW_TADDR: if(p && p->ah) - printHWaddr(kafka,p->ah->arp_tha,buf,bufLen); + printHWaddr(printbuf,p->ah->arp_tha,buf,bufLen); break; case ARP_HW_TPROT: if(p && p->ah) { - KafkaLog_Puts(kafka, "0x"); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[0],buf,bufLen)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[1],buf,bufLen)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[2],buf,bufLen)); - KafkaLog_Puts(kafka, itoa16(p->ah->arp_tpa[3],buf,bufLen)); + printbuf_memappend_fast_str(printbuf, "0x"); + printbuf_memappend_fast_str(printbuf, itoa16(p->ah->arp_tpa[0],buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa16(p->ah->arp_tpa[1],buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa16(p->ah->arp_tpa[2],buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa16(p->ah->arp_tpa[3],buf,bufLen)); } break; case ETHTYPE: if(p && p->eh) { - KafkaLog_Puts(kafka, itoa10(ntohs(p->eh->ether_type),buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa10(ntohs(p->eh->ether_type),buf,bufLen)); } break; case UDPLENGTH: if(p && p->udph){ - KafkaLog_Puts(kafka, itoa10(ntohs(p->udph->uh_len),buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa10(ntohs(p->udph->uh_len),buf,bufLen)); } break; case ETHLENGTH: if(p && p->eh){ - KafkaLog_Puts(kafka, itoa10(p->pkth->len,buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa10(p->pkth->len,buf,bufLen)); } break; case ETHLENGTH_RANGE: if(p && p->eh){ if(p->pkth->len==0) - KafkaLog_Puts(kafka, "0"); + printbuf_memappend_fast_str(printbuf, "0"); if(p->pkth->len<=64) - KafkaLog_Puts(kafka, "(0-64]"); + printbuf_memappend_fast_str(printbuf, "(0-64]"); else if(p->pkth->len<=128) - KafkaLog_Puts(kafka, "(64-128]"); + printbuf_memappend_fast_str(printbuf, "(64-128]"); else if(p->pkth->len<=256) - KafkaLog_Puts(kafka, "(128-256]"); + printbuf_memappend_fast_str(printbuf, "(128-256]"); else if(p->pkth->len<=512) - KafkaLog_Puts(kafka, "(256-512]"); + printbuf_memappend_fast_str(printbuf, "(256-512]"); else if(p->pkth->len<=768) - KafkaLog_Puts(kafka, "(512-768]"); + printbuf_memappend_fast_str(printbuf, "(512-768]"); else if(p->pkth->len<=1024) - KafkaLog_Puts(kafka, "(768-1024]"); + printbuf_memappend_fast_str(printbuf, "(768-1024]"); else if(p->pkth->len<=1280) - KafkaLog_Puts(kafka, "(1024-1280]"); + printbuf_memappend_fast_str(printbuf, "(1024-1280]"); else if(p->pkth->len<=1514) - KafkaLog_Puts(kafka, "(1280-1514]"); + printbuf_memappend_fast_str(printbuf, "(1280-1514]"); else if(p->pkth->len<=2048) - KafkaLog_Puts(kafka, "(1514-2048]"); + printbuf_memappend_fast_str(printbuf, "(1514-2048]"); else if(p->pkth->len<=4096) - KafkaLog_Puts(kafka, "(2048-4096]"); + printbuf_memappend_fast_str(printbuf, "(2048-4096]"); else if(p->pkth->len<=8192) - KafkaLog_Puts(kafka, "(4096-8192]"); + printbuf_memappend_fast_str(printbuf, "(4096-8192]"); else if(p->pkth->len<=16384) - KafkaLog_Puts(kafka, "(8192-16384]"); + printbuf_memappend_fast_str(printbuf, "(8192-16384]"); else if(p->pkth->len<=32768) - KafkaLog_Puts(kafka, "(16384-32768]"); + printbuf_memappend_fast_str(printbuf, "(16384-32768]"); else - KafkaLog_Puts(kafka, ">32768"); + printbuf_memappend_fast_str(printbuf, ">32768"); } break; case VLAN_PRIORITY: if(p && p->vh) - KafkaLog_Puts(kafka,itoa10(VTH_PRIORITY(p->vh),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(VTH_PRIORITY(p->vh),buf,bufLen)); break; case VLAN_DROP: if(p && p->vh) - KafkaLog_Puts(kafka,itoa10(VTH_CFI(p->vh),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(VTH_CFI(p->vh),buf,bufLen)); break; case VLAN: { int ok; const uint16_t vlan = extract_vlan_id(event, event_type, p, &ok); if(ok) - KafkaLog_Puts(kafka,itoa10(vlan,buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(vlan,buf,bufLen)); } break; case VLAN_NAME: @@ -1586,9 +1696,9 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, { const Number_str_assoc * vlan_str = SearchNumberStr(vlan,jsonData->vlans); if(vlan_str) - KafkaLog_Puts(kafka,vlan_str->human_readable_str); + printbuf_memappend_fast_str(printbuf,vlan_str->human_readable_str); else - KafkaLog_Puts(kafka,itoa10(vlan,buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(vlan,buf,bufLen)); } } break; @@ -1604,9 +1714,9 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, if(port!=0) { if(service_name_asoc) - KafkaLog_Puts(kafka,service_name_asoc->human_readable_str); + printbuf_memappend_fast_str(printbuf,service_name_asoc->human_readable_str); else /* Log port number */ - KafkaLog_Puts(kafka,itoa10(port,buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(port,buf,bufLen)); } } break; @@ -1619,7 +1729,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, :extract_dst_port(event, event_type, p); if(port!=0) - KafkaLog_Puts(kafka,itoa10(port,buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(port,buf,bufLen)); } break; @@ -1628,14 +1738,14 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, /*if(sfip_family(&ip)==AF_INET){ // buggy sfip_family macro...*/ if(ip.family==AF_INET) { - KafkaLog_Puts(kafka,itoa10(*ip.ip32, buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(*ip.ip32, buf,bufLen)); } /* doesn't make very sense print so large number. If you want, make me know. */ break; case SRC_STR: case DST_STR: { - KafkaLog_Puts(kafka,sfip_to_str(&ip)); + printbuf_memappend_fast_str(printbuf,sfip_to_str(&ip)); } break; case SRC_NAME: @@ -1643,7 +1753,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, { Number_str_assoc * ip_str_node = SearchIpStr(ip,jsonData->hosts,HOSTS); const char * ip_name = ip_str_node ? ip_str_node->human_readable_str : sfip_to_str(&ip); - KafkaLog_Puts(kafka,ip_name); + printbuf_memappend_fast_str(printbuf,ip_name); } break; case SRC_NET: @@ -1651,7 +1761,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, { Number_str_assoc *ip_net = SearchIpStr(ip,jsonData->nets,NETWORKS); if(ip_net) - KafkaLog_Puts(kafka,ip_net->number_as_str); + printbuf_memappend_fast_str(printbuf,ip_net->number_as_str); } break; case SRC_NET_NAME: @@ -1659,7 +1769,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, { Number_str_assoc *ip_net = SearchIpStr(ip,jsonData->nets,NETWORKS); if(ip_net) - KafkaLog_Puts(kafka,ip_net->human_readable_str); + printbuf_memappend_fast_str(printbuf,ip_net->human_readable_str); } break; @@ -1669,7 +1779,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, { const char * country_name = extract_country(jsonData,&ip); if(country_name) - KafkaLog_Puts(kafka,country_name); + printbuf_memappend_fast_str(printbuf,country_name); } break; @@ -1678,7 +1788,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, if(jsonData->gi){ const char * country_code = extract_country_code(jsonData,&ip); if(country_code) - KafkaLog_Puts(kafka,country_code); + printbuf_memappend_fast_str(printbuf,country_code); } break; @@ -1690,7 +1800,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, { const char *space = strchr(as_name,' '); if(space) - KafkaLog_Write(kafka,as_name+2,space - &as_name[2]); + printbuf_memappend_fast(printbuf,as_name+2,space - &as_name[2]); free(as_name); } } @@ -1704,7 +1814,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, { const char * space = strchr(as_name,' '); if(space) - KafkaLog_Puts(kafka,space+1); + printbuf_memappend_fast_str(printbuf,space+1); free(as_name); } } @@ -1717,7 +1827,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, int ok; const uint16_t itype = extract_icmp_type(event,event_type,p,&ok); if(ok) - KafkaLog_Puts(kafka, itoa10(itype,buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa10(itype,buf,bufLen)); } break; case ICMPCODE: @@ -1725,12 +1835,12 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, int ok; const uint16_t icode = extract_icmp_code(event,event_type,p,&ok); if(ok) - KafkaLog_Puts(kafka, itoa10(icode,buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa10(icode,buf,bufLen)); } break; case ICMPID: if(p && p->icmph) - KafkaLog_Puts(kafka, itoa10(ntohs(p->icmph->s_icmp_id),buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa10(ntohs(p->icmph->s_icmp_id),buf,bufLen)); break; case ICMPSEQ: if(p && p->icmph){ @@ -1738,25 +1848,25 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, PrintJSONFieldName(kafka,JSON_ICMPSEQ_NAME); KafkaLog_Print(kafka, "%d",ntohs(p->icmph->s_icmp_seq)); */ - KafkaLog_Puts(kafka,itoa10(ntohs(p->icmph->s_icmp_seq),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(ntohs(p->icmph->s_icmp_seq),buf,bufLen)); } break; case TTL: if(p && IPH_IS_VALID(p)) - KafkaLog_Puts(kafka,itoa10(GET_IPH_TTL(p),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(GET_IPH_TTL(p),buf,bufLen)); break; case TOS: if(p && IPH_IS_VALID(p)) - KafkaLog_Puts(kafka,itoa10(GET_IPH_TOS(p),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(GET_IPH_TOS(p),buf,bufLen)); break; case ID: if(p && IPH_IS_VALID(p)) - KafkaLog_Puts(kafka,itoa10(IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p)),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(IS_IP6(p) ? ntohl(GET_IPH_ID(p)) : ntohs((u_int16_t)GET_IPH_ID(p)),buf,bufLen)); break; case IPLEN: if(p && IPH_IS_VALID(p)) - KafkaLog_Puts(kafka,itoa10(ntohs(GET_IPH_LEN(p)),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(ntohs(GET_IPH_LEN(p)),buf,bufLen)); break; case IPLEN_RANGE: if(p && IPH_IS_VALID(p)) @@ -1766,45 +1876,45 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, const unsigned int upper_limit = pow(2.0,ceil(log2_len)); //printf("log2_len: %0lf; floor: %0lf; ceil: %0lf; low_limit: %0lf; upper_limit:%0lf\n", // log2_len,floor(log2_len),ceil(log2_len),pow(floor(log2_len),2.0),pow(ceil(log2_len),2)); - KafkaLog_Print(kafka,"[%u-%u)",lower_limit,upper_limit); + sprintbuf(printbuf,"[%u-%u)",lower_limit,upper_limit); //printf(kafka,"[%lf-%lf)\n",lower_limit,upper_limit); } break; case DGMLEN: if(p && IPH_IS_VALID(p)){ // XXX might cause a bug when IPv6 is printed? - KafkaLog_Puts(kafka, itoa10(ntohs(GET_IPH_LEN(p)),buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa10(ntohs(GET_IPH_LEN(p)),buf,bufLen)); } break; case TCPSEQ: if(p && p->tcph){ // KafkaLog_Print(kafka, "lX%0x",(u_long) ntohl(p->tcph->th_ack)); // hex format - KafkaLog_Puts(kafka,itoa10(ntohl(p->tcph->th_seq),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(ntohl(p->tcph->th_seq),buf,bufLen)); } break; case TCPACK: if(p && p->tcph){ // KafkaLog_Print(kafka, "0x%lX",(u_long) ntohl(p->tcph->th_ack)); - KafkaLog_Puts(kafka,itoa10(ntohl(p->tcph->th_ack),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(ntohl(p->tcph->th_ack),buf,bufLen)); } break; case TCPLEN: if(p && p->tcph){ - KafkaLog_Puts(kafka, itoa10(TCP_OFFSET(p->tcph) << 2,buf,bufLen)); + printbuf_memappend_fast_str(printbuf, itoa10(TCP_OFFSET(p->tcph) << 2,buf,bufLen)); } break; case TCPWINDOW: if(p && p->tcph){ //KafkaLog_Print(kafka, "0x%X",ntohs(p->tcph->th_win)); // hex format - KafkaLog_Puts(kafka,itoa10(ntohs(p->tcph->th_win),buf,bufLen)); + printbuf_memappend_fast_str(printbuf,itoa10(ntohs(p->tcph->th_win),buf,bufLen)); } break; case TCPFLAGS: if(p && p->tcph) { CreateTCPFlagString(p, tcpFlags); - KafkaLog_Puts(kafka, tcpFlags); + printbuf_memappend_fast_str(printbuf, tcpFlags); } break; @@ -1813,7 +1923,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, break; }; - return KafkaLog_Tell(kafka)-initial_buffer_pos; /* if we have write something */ + return printbuf->bpos-initial_buffer_pos; /* if we have write something */ } /* @@ -1832,7 +1942,14 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO { TemplateElementsList * iter; - KafkaLog * kafka = jsonData->kafka; + RefcntPrintbuf *rprintbuf = calloc(1,sizeof(*rprintbuf)); + if(NULL == rprintbuf) { + ErrorMessage("alert_json, (%s:%d): Couldn't allocate (out of memory?)",__FUNCTION__,__LINE__); + return; + } + + printbuf_new(&rprintbuf->printbuf); + struct printbuf *printbuf = &rprintbuf->printbuf; // if(p == NULL) // return; @@ -1844,42 +1961,66 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO } DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging JSON Alert data\n");); - KafkaLog_Putc(kafka,'{'); + printbuf_memappend_fast_str(printbuf,"{"); for(iter=jsonData->outputTemplate;iter;iter=iter->next) { - const int initial_pos = KafkaLog_Tell(kafka); + const int initial_pos = printbuf->bpos; if(iter!=jsonData->outputTemplate) - KafkaLog_Puts(kafka,JSON_FIELDS_SEPARATOR); + printbuf_memappend_fast_str(printbuf,JSON_FIELDS_SEPARATOR); - KafkaLog_Putc(kafka,'"'); - KafkaLog_Puts(kafka,iter->templateElement->jsonName); - KafkaLog_Puts(kafka,"\":"); + printbuf_memappend_fast_str(printbuf,"\""); + printbuf_memappend_fast_str(printbuf,iter->templateElement->jsonName); + printbuf_memappend_fast_str(printbuf,"\":"); if(iter->templateElement->printFormat==stringFormat) - KafkaLog_Putc(kafka,'"'); - const int writed = printElementWithTemplate(p,event,event_type,jsonData,iter->templateElement); + printbuf_memappend_fast_str(printbuf,"\""); + const int writed = printElementWithTemplate(p,event,event_type,jsonData,iter->templateElement,printbuf); if(iter->templateElement->printFormat==stringFormat) - KafkaLog_Putc(kafka,'"'); + printbuf_memappend_fast_str(printbuf,"\""); if(0==writed) { - #ifdef HAVE_LIBRDKAFKA - kafka->pos = initial_pos; // Revert the insertion of empty element */ - #endif - - if(kafka->textLog) - kafka->textLog->pos = initial_pos; + rprintbuf->printbuf.bpos = initial_pos; } } if(jsonData->enrich_with) { - KafkaLog_Puts(kafka,jsonData->enrich_with); + printbuf_memappend_fast_str(printbuf,jsonData->enrich_with); } - KafkaLog_Putc(kafka,'}'); + printbuf_memappend_fast_str(printbuf,"}"); // Just for debug - DEBUG_WRAP(DebugMessage(DEBUG_LOG,"[KAFKA]: %s",kafka->buf);); - KafkaLog_Flush(kafka); + DEBUG_WRAP(DebugMessage(DEBUG_LOG,"[alert_json]: %s",printbuf->buf);); + + rprintbuf->refcnt = 1; + +#ifdef HAVE_LIBRDKAFKA + if(unlikely(NULL == jsonData->kafka.rk && NULL != jsonData->kafka.brokers)) + { + AlertJsonKafkaDelayedInit(jsonData); + } + + if(jsonData->kafka.rkt) + { + const int produce_rc = rd_kafka_produce(jsonData->kafka.rkt, RD_KAFKA_PARTITION_UA, + /* Free/copy flags */ + 0, + /* Payload and length */ + printbuf->buf, printbuf->bpos, + /* Optional key and its length */ + NULL, 0, + /* Message opaque, provided in + * delivery report callback as + * msg_opaque. */ + rprintbuf); + + if(produce_rc < 0) { + ErrorMessage("alert_json: Failed to produce message: %s", + rd_kafka_err2str(rd_kafka_errno2err(errno))); + DecRefcntPrintbuf(rprintbuf); + } + } +#endif } diff --git a/src/rbutil/Makefile.am b/src/rbutil/Makefile.am index 186308d..51c0217 100644 --- a/src/rbutil/Makefile.am +++ b/src/rbutil/Makefile.am @@ -2,6 +2,6 @@ AUTOMAKE_OPTIONS=foreign no-dependencies noinst_LIBRARIES = librbutil.a -librbutil_a_SOURCES = rb_kafka.c rb_kafka.h rb_numstrpair_list.h rb_numstrpair_list.c rb_unified2.c +librbutil_a_SOURCES = rb_printbuf.c rb_numstrpair_list.h rb_numstrpair_list.c rb_unified2.c INCLUDES = -I.. -I../sfutil diff --git a/src/rbutil/rb_kafka.c b/src/rbutil/rb_kafka.c deleted file mode 100644 index b5bf35d..0000000 --- a/src/rbutil/rb_kafka.c +++ /dev/null @@ -1,419 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2013 Eneo Tecnologia S.L. - * Author: Eugenio Perez - * Based on sf_text source. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License Version 2 as - * published by the Free Software Foundation. You may not use, modify or - * distribute this program under any other version of the GNU General - * Public License. - * - * 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. - * - ****************************************************************************/ - -/** - * @file rb_kafka.c - * @author Eugenio Perez - * based on the Russ Combs's sf_textlog.c - * @date - * - * @brief implements buffered text stream for logging - * - * Api for buffered logging and send to an Apache Kafka - * Server. This allows unify the way to write json in a file and sending to - * kafka using TextLog_sf. - */ - -#include -#include -#include -#include -#include -#include - -#include "rb_kafka.h" -#include "log.h" -#include "util.h" -#include "assert.h" -#include "unistd.h" - -#include "barnyard2.h" - -/* branch predictions */ -#ifdef __GNUC__ -#define likely(x) __builtin_expect(!!(x), 1) -#define unlikely(x) __builtin_expect(!!(x), 0) -#else -#define likely(x) (x) -#define unlikely(x) (x) -#endif - -#define RB_UNUSED __attribute__((unused)) - - -#ifdef HAVE_LIBRDKAFKA - -/*------------------------------------------------------------------- - * msg_delivered: callback function for every message. - *------------------------------------------------------------------- - */ - -static inline void msg_delivered (rd_kafka_t *rk RB_UNUSED, - void *payload RB_UNUSED, size_t len, - int error_code, - void *opaque RB_UNUSED, void *msg_opaque RB_UNUSED) { - - if (unlikely(error_code)) - ErrorMessage("rdkafka Message delivery failed: %s\n",rd_kafka_err2str(error_code)); - else if (unlikely(BcLogVerbose())) - LogMessage("rdkafka Message delivered (%zd bytes)\n", len); -} - -/*------------------------------------------------------------------- - * TextLog_Open/Close: open/close associated log file - *------------------------------------------------------------------- - */ -static void KafkaLog_Open (KafkaLog *this) -{ - char errstr[256]; - - if(!this->rk_conf) - FatalError("KafkaLog_Open called with NULL==this->rk_conf\n"); - - if(!this->rkt_conf) - FatalError("KafkaLog_Open called with NULL==this->rkt_conf\n"); - - rd_kafka_conf_set_dr_cb(this->rk_conf,msg_delivered); - this->handler = rd_kafka_new(RD_KAFKA_PRODUCER, this->rk_conf, errstr, sizeof(errstr)); - - if(NULL==this->handler) - FatalError("Failed to create new producer: %s\n",errstr); - - if (rd_kafka_brokers_add(this->handler, this->broker) == 0) - FatalError("Kafka: No valid brokers specified in %s\n",this->broker); - - this->rkt = rd_kafka_topic_new(this->handler, this->topic, this->rkt_conf); - - if(NULL==this->rkt) - FatalError("It was not possible create a kafka topic %s\n",this->topic); -} - -static void KafkaLog_Close (rd_kafka_t* handle) -{ - if ( !handle ) return; - - /* Wait for messaging to finish. */ - unsigned throw_msg_count = 10; - unsigned msg_left,prev_msg_left = 0; - while((msg_left = rd_kafka_outq_len (handle) > 0) && throw_msg_count) - { - if(prev_msg_left == msg_left) /* Send no messages in a second? probably, the broker has fall down */ - throw_msg_count--; - else - throw_msg_count = 10; - DEBUG_WRAP(DebugMessage(DEBUG_OUTPUT_PLUGIN, - "[Thread %u] Waiting for messages to send. Still %u messages to be exported. %u retries left.\n");); - prev_msg_left = msg_left; - rd_kafka_poll(handle,100); - } - - /* Destroy the handle */ - rd_kafka_destroy(handle); -} - -#endif /* HAVE_LIBRDKAFKA */ - -/*------------------------------------------------------------------- - * KafkaLog_Init: constructor - * If open=1, will create kafka handler. If not, KafkaLog->handler returned from this function - * will be null. - * This is useful for the rd_kafka_new work way, cause it throws a new thread - * to queue messages. If we are in daemon mode, the thread will be created before the fork(), - * and we cannot communicate the message to the queue again. - *------------------------------------------------------------------- - */ -KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int bufLen, const char * topic, const char*filename - #ifdef HAVE_LIBRDKAFKA - ,rd_kafka_conf_t *rk_conf,rd_kafka_topic_conf_t *rkt_conf - #endif -) { - KafkaLog* this; - - this = (KafkaLog*)SnortAlloc(sizeof(KafkaLog)); - #ifdef HAVE_LIBRDKAFKA - if(this){ - this->buf = SnortAlloc(sizeof(char)*bufLen); - - if ( !this->buf) - { - FatalError("Unable to allocate a buffer for KafkaLog(%u)!\n", bufLen); - } - }else{ - FatalError("Unable to allocate KafkaLog!\n"); - } - this->broker = broker ? SnortStrdup(broker) : NULL; - this->topic = topic ? SnortStrdup(topic) : NULL; - - this->rk_conf = rk_conf; - this->rkt_conf = rkt_conf; - - this->bufLen = this->start_bufLen = bufLen; - #endif /* HAVE_LIBRDKAFKA */ - this->textLog = NULL; /* Force NULL by now */ - KafkaLog_Reset(this); - - return this; -} - -/*------------------------------------------------------------------- - * KafkaLog_Term: destructor - *------------------------------------------------------------------- - */ -void KafkaLog_Term (KafkaLog* this) -{ - if ( !this ) return; - - KafkaLog_Flush(this); - #ifdef HAVE_LIBRDKAFKA - KafkaLog_Close(this->handler); - free(this->buf); - - if ( this->broker ) free(this->broker); - if ( this->topic ) free(this->topic); - #endif - - if(this->textLog) TextLog_Term(this->textLog); - free(this); -} - - - -/*------------------------------------------------------------------- - * KafkaLog_Flush: send buffered stream to a kafka server - *------------------------------------------------------------------- - */ -bool KafkaLog_Flush(KafkaLog* this) -{ -#if HAVE_LIBRDKAFKA - if ( !this->pos ) return FALSE; - - // In daemon mode, we must start the handler here - if(unlikely(this->handler==NULL && this->broker && this->topic)) - { - KafkaLog_Open(this); - if(!this->handler) - FatalError("It was not possible create a kafka handler\n",this->broker); - } - - /* rd_kafka_dump(stdout,this->handler); */ - int retried = 0; - do{ - const int produce_rc = rd_kafka_produce(this->rkt, RD_KAFKA_PARTITION_UA, - RD_KAFKA_MSG_F_FREE, - /* Payload and length */ - this->buf, this->pos, - /* Optional key and its length */ - NULL, 0, - /* Message opaque, provided in - * delivery report callback as - * msg_opaque. */ - NULL); - - if(likely(produce_rc) != -1){ - break; - }else{ - rd_kafka_resp_err_t err = rd_kafka_errno2err(errno); - if(err != RD_KAFKA_RESP_ERR__QUEUE_FULL || retried){ - ErrorMessage("Failed to produce message: %s",rd_kafka_err2str(err)); - free(this->buf); - this->buf = NULL; - break; - }else{ - // Queue full. Backpressure. - rd_kafka_poll(this->handler,5); - } - } - }while(1); - /* Poll to handle delivery reports */ - rd_kafka_poll(this->handler, 0); - - this->buf = SnortAlloc(sizeof(char)*this->start_bufLen); - this->bufLen = this->start_bufLen; - -#endif /* HAVE_LIBRDKAFKA */ - - if(this->textLog) TextLog_Flush(this->textLog); - - KafkaLog_Reset(this); - return TRUE; -} - -bool KafkaLog_FlushAll(KafkaLog* this) -{ -#if HAVE_LIBRDKAFKA - while (rd_kafka_outq_len(this->handler) > 0) - rd_kafka_poll(this->handler, 100); -#endif /* HAVE_LIBRDKAFKA */ - - if(this->textLog) TextLog_Flush(this->textLog); - - KafkaLog_Reset(this); - return TRUE; -} - -/*------------------------------------------------------------------- - * KafkaLog_Putc: append char to buffer - *------------------------------------------------------------------- - */ -bool KafkaLog_Putc (KafkaLog* this, char c) -{ - #ifdef HAVE_LIBRDKAFKA - if ( KafkaLog_Avail(this) < 1 ) - { - KafkaLog_Flush(this); - } - this->buf[this->pos++] = c; - this->buf[this->pos] = '\0'; - #endif // HAVE_LIBRDKAFKA - - if(this->textLog) TextLog_Putc(this->textLog,c); - return TRUE; -} - -/*------------------------------------------------------------------- - * KafkaLog_Write: append string to buffer - *------------------------------------------------------------------- - */ -bool KafkaLog_Write (KafkaLog* this, const char* str, int len) -{ -#ifdef HAVE_LIBRDKAFKA - while ( len >= KafkaLog_Avail(this) ) - { - this->bufLen*=2; - this->buf = realloc(this->buf,this->bufLen); - if(NULL==this->buf) - return FALSE; - } - this->buf[this->pos]='\0'; /* just in case */ - strncat(this->buf+this->pos, str, len); - this->pos += len; - assert(this->buf[this->pos] == '\0'); - -#endif // HAVE_LIBRDKAFKA - if(this->textLog) TextLog_Write(this->textLog,str,len); - return TRUE; -} - -/*------------------------------------------------------------------- - * KafkaLog_Printf: append formatted string to buffer - *------------------------------------------------------------------- - */ -bool KafkaLog_Print (KafkaLog* this, const char* fmt, ...) -{ - int avail = KafkaLog_Avail(this); - int len; - va_list ap; - - va_start(ap, fmt); -#ifdef HAVE_LIBRDKAFKA - len = vsnprintf(this->buf+this->pos, avail, fmt, ap); -#endif - if(this->textLog) - vsnprintf(this->textLog->buf+this->textLog->pos, avail, fmt, ap); - va_end(ap); - -#ifdef HAVE_LIBRDKAFKA - while(len >= avail){ - // Send a half json message to Kafka has no sense, so we will try to - // increase the buffer's lenght to allocate the full message. - // TextLog's print will be not changed, just inlined here. - this->bufLen*=2; - this->buf = realloc(this->buf,this->bufLen); - if(!this->buf) - FatalError("It was not possible to allocate a buffer"); - va_start(ap, fmt); - len = vsnprintf(this->buf+this->pos, avail, fmt, ap); - va_end(ap); - } -#endif - - - // TextLog's TextLog_Print - if ( len >= avail ) - { - if(this->textLog) TextLog_Flush(this->textLog); - avail = KafkaLog_Avail(this); - - va_start(ap, fmt); - if(this->textLog) - len = vsnprintf(this->textLog->buf+this->textLog->pos, avail, fmt, ap); - va_end(ap); - } - if ( len >= avail ) - { - if(this->textLog){ - this->textLog->pos = this->textLog->maxBuf - 1; - this->textLog->buf[this->textLog->pos] = '\0'; - } - // NOPE! return FALSE; - } - else if ( len < 0 ) - { - // NOPE! return FALSE; - } -#ifdef HAVE_LIBRDKAFKA - this->pos += len; -#endif - if(this->textLog) this->textLog->pos += len; - return TRUE; -} - -/*------------------------------------------------------------------- - * KafkaLog_Quote: write string escaping quotes - * FIXTHIS could be smarter by counting required escapes instead of - * checking for 3 - *------------------------------------------------------------------- - */ -bool KafkaLog_Quote (KafkaLog* this, const char* qs) -{ -#ifdef HAVE_LIBRDKAFKA - int pos = this->pos; - - if ( KafkaLog_Avail(this) < 3 ) - { - this->buf = realloc(this->buf,KafkaLog_Avail(this)+3); - if(!this->buf) - FatalError("Could not allocate memory for KafkaLog"); - } - this->buf[pos++] = '"'; - - while ( *qs && (this->bufLen - pos > 2) ) - { - if ( *qs == '"' || *qs == '\\' ) - { - this->buf[pos++] = '\\'; - } - this->buf[pos++] = *qs++; - } - if ( *qs ) return FALSE; - - this->buf[pos++] = '"'; - this->pos = pos; -#endif - - if(this->textLog) TextLog_Quote(this->textLog,qs); - - return TRUE; -} - diff --git a/src/rbutil/rb_kafka.h b/src/rbutil/rb_kafka.h deleted file mode 100644 index 381aba1..0000000 --- a/src/rbutil/rb_kafka.h +++ /dev/null @@ -1,150 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2013 Eneo Tecnologia S.L. - * Author: Eugenio Perez - * Based on sf_text source. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License Version 2 as - * published by the Free Software Foundation. You may not use, modify or - * distribute this program under any other version of the GNU General - * Public License. - * - * 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. - * - ****************************************************************************/ - -/** - * @file rb_kafka.h - * @author Eugenio Pérez - * @date Wed May 29 2013 - * - * @brief declares buffered text stream for logging - * Based on sf_text source. - * - * Declares a KafkaLog_*() api for buffered logging and send to an Apache Kafka - * Server. This allows unify the way to write json in a file using TextLog_sf and - * sending it to kafka. - */ - -#ifndef _RB_KAFKA_LOG_H -#define _RB_KAFKA_LOG_H - -#include -#include -#include - -#include "config.h" -#include "debug.h" /* for INLINE */ -#include "sfutil/sf_textlog.h" -#ifdef HAVE_LIBRDKAFKA -#include "librdkafka/rdkafka.h" -#endif - -#ifndef _SF_TEXT_LOG_H // already defined in -typedef int bool; -#define TRUE 1 -#define FALSE 0 - -#define K_BYTES (1024) -#define M_BYTES (K_BYTES*K_BYTES) -#define G_BYTES (K_BYTES*M_BYTES) -#endif - - -#define KAFKA_AUXBUF_SIZE 4096 - -/* - * DO NOT ACCESS STRUCT MEMBERS DIRECTLY - * EXCEPT FROM WITHIN THE IMPLEMENTATION! - */ -typedef struct _KafkaLog -{ -#ifdef HAVE_LIBRDKAFKA -/* private: */ -/* broker attributes: */ - rd_kafka_t * handler; - char* broker; - char * topic; - rd_kafka_topic_t *rkt; - - rd_kafka_conf_t *rk_conf; - rd_kafka_topic_conf_t *rkt_conf; - -/* buffer attributes: */ - unsigned int pos; - unsigned int bufLen; - unsigned int start_bufLen; - char * buf; -#endif -/* TextLog helper. Useful for loggind and just send data to a json file */ - TextLog * textLog; -} KafkaLog; - -KafkaLog* KafkaLog_Init ( - const char* broker, unsigned int bufLen, const char *topic, const char *filename - #ifdef HAVE_LIBRDKAFKA - ,rd_kafka_conf_t *rk_conf,rd_kafka_topic_conf_t *rkt_conf - #endif -); -void KafkaLog_Term (KafkaLog* this); - -bool KafkaLog_Putc(KafkaLog*, char); -bool KafkaLog_Quote(KafkaLog*, const char*); -bool KafkaLog_Write(KafkaLog*, const char*, int len); -bool KafkaLog_Print(KafkaLog*, const char* format, ...); - -bool KafkaLog_Flush(KafkaLog*); -bool KafkaLog_FlushAll(KafkaLog*); - -/*------------------------------------------------------------------- - * helper functions - *------------------------------------------------------------------- - */ - static INLINE int KafkaLog_Tell (KafkaLog* this) - { - #ifndef HAVE_LIBRDKAFKA - return this->textLog?this->textLog->pos:0; - #else - return this->pos; - #endif - } - - static INLINE int KafkaLog_Avail (KafkaLog* this) - { - #ifndef HAVE_LIBRDKAFKA - return this->textLog?TextLog_Avail(this->textLog):0; - #else - return this->bufLen - this->pos - 1; - #endif - } - - static INLINE void KafkaLog_Reset (KafkaLog* this) - { - if(this->textLog) - TextLog_Reset(this->textLog); - #ifdef HAVE_LIBRDKAFKA - this->pos = 0; - this->buf[this->pos] = '\0'; - #endif - } - -static INLINE bool KafkaLog_NewLine (KafkaLog* this) -{ - return KafkaLog_Putc(this, '\n'); -} - -static INLINE bool KafkaLog_Puts (KafkaLog* this, const char* str) -{ - return KafkaLog_Write(this, str, strlen(str)); -} - -#endif /* _RB_KAFKA_LOG_H */ - diff --git a/src/rbutil/rb_printbuf.c b/src/rbutil/rb_printbuf.c new file mode 100644 index 0000000..6a9ad3b --- /dev/null +++ b/src/rbutil/rb_printbuf.c @@ -0,0 +1,169 @@ +/* + * $Id: printbuf.c,v 1.5 2006/01/26 02:16:28 mclark Exp $ + * + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. + * Michael Clark + * + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. + * + * + * Copyright (c) 2008-2009 Yahoo! Inc. All rights reserved. + * The copyrights to the contents of this file are licensed under the MIT License + * (http://www.opensource.org/licenses/mit-license.php) + */ + + /* + * REDBORDER MODS: + * + Changed default starting buffer (from 32 to 2048) + */ + +#define _GNU_SOURCE /* vasprintf */ + +#include "config.h" + +#include +#include +#include +#include + +#include + +//#include "bits.h" +#ifndef _bits_h_ +#define _bits_h_ + +#ifndef json_min +#define json_min(a,b) ((a) < (b) ? (a) : (b)) +#endif + +#ifndef json_max +#define json_max(a,b) ((a) > (b) ? (a) : (b)) +#endif + +#define hexdigit(x) (((x) <= '9') ? (x) - '0' : ((x) & 7) + 9) +#define error_ptr(error) ((void*)error) +#define error_description(error) (json_tokener_errors[error]) +#define is_error(ptr) (ptr == NULL) + +#endif + +//#include "debug.h" +#include "rb_printbuf.h" + + +static int printbuf_extend(struct printbuf *p, int min_size); + +struct printbuf* printbuf_new(struct printbuf *p) +{ + p->size = 4096; + p->bpos = 0; + if(!(p->buf = (char*)malloc(p->size))) { + return NULL; + } + return p; +} + + +/** + * Extend the buffer p so it has a size of at least min_size. + * + * If the current size is large enough, nothing is changed. + * + * Note: this does not check the available space! The caller + * is responsible for performing those calculations. + */ +static int printbuf_extend(struct printbuf *p, int min_size) +{ + char *t; + int new_size; + + if (p->size >= min_size) + return 0; + + new_size = json_max(p->size * 2, min_size + 8); +#ifdef PRINTBUF_DEBUG + MC_DEBUG("printbuf_memappend: realloc " + "bpos=%d min_size=%d old_size=%d new_size=%d\n", + p->bpos, min_size, p->size, new_size); +#endif /* PRINTBUF_DEBUG */ + if(!(t = (char*)realloc(p->buf, new_size))) + return -1; + p->size = new_size; + p->buf = t; + return 0; +} + +int printbuf_memappend(struct printbuf *p, const char *buf, int size) +{ + if (p->size <= p->bpos + size + 1) { + if (printbuf_extend(p, p->bpos + size + 1) < 0) + return -1; + } + memcpy(p->buf + p->bpos, buf, size); + p->bpos += size; + p->buf[p->bpos]= '\0'; + return size; +} + +int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len) +{ + int size_needed; + + if (offset == -1) + offset = pb->bpos; + size_needed = offset + len; + if (pb->size < size_needed) + { + if (printbuf_extend(pb, size_needed) < 0) + return -1; + } + + memset(pb->buf + offset, charvalue, len); + if (pb->bpos < size_needed) + pb->bpos = size_needed; + + return 0; +} + +int sprintbuf(struct printbuf *p, const char *msg, ...) +{ + va_list ap; + char *t; + int size; + char buf[128]; + + /* user stack buffer first */ + va_start(ap, msg); + size = vsnprintf(buf, 128, msg, ap); + va_end(ap); + /* if string is greater than stack buffer, then use dynamic string + with vasprintf. Note: some implementation of vsnprintf return -1 + if output is truncated whereas some return the number of bytes that + would have been written - this code handles both cases. */ + if(size == -1 || size > 127) { + va_start(ap, msg); + if((size = vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; } + va_end(ap); + printbuf_memappend(p, t, size); + free(t); + return size; + } else { + printbuf_memappend(p, buf, size); + return size; + } +} + +void printbuf_reset(struct printbuf *p) +{ + p->buf[0] = '\0'; + p->bpos = 0; +} + +void printbuf_free(struct printbuf *p) +{ + if(p) { + free(p->buf); + free(p); + } +} diff --git a/src/rbutil/rb_printbuf.h b/src/rbutil/rb_printbuf.h new file mode 100644 index 0000000..f62820e --- /dev/null +++ b/src/rbutil/rb_printbuf.h @@ -0,0 +1,90 @@ +/* + * $Id: printbuf.h,v 1.4 2006/01/26 02:16:28 mclark Exp $ + * + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. + * Michael Clark + * + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. + * + * + * Copyright (c) 2008-2009 Yahoo! Inc. All rights reserved. + * The copyrights to the contents of this file are licensed under the MIT License + * (http://www.opensource.org/licenses/mit-license.php) + */ + +#ifndef _printbuf_h_ +#define _printbuf_h_ + + #include + +#ifdef __cplusplus +extern "C" { +#endif + +struct printbuf { + char *buf; + size_t bpos; + size_t size; +}; + +extern struct printbuf* +printbuf_new(struct printbuf* pb); + +/* As an optimization, printbuf_memappend_fast is defined as a macro + * that handles copying data if the buffer is large enough; otherwise + * it invokes printbuf_memappend_real() which performs the heavy + * lifting of realloc()ing the buffer and copying data. + * Your code should not use printbuf_memappend directly--use + * printbuf_memappend_fast instead. + */ +extern int +printbuf_memappend(struct printbuf *p, const char *buf, int size); + +#define printbuf_memappend_fast(p, bufptr, bufsize) \ +do { \ + if ((p->size - p->bpos) > bufsize) { \ + memcpy(p->buf + p->bpos, (bufptr), bufsize); \ + p->bpos += bufsize; \ + p->buf[p->bpos]= '\0'; \ + } else { printbuf_memappend(p, (bufptr), bufsize); } \ +} while (0) + +#define printbuf_memappend_fast_str(p, bufptr) printbuf_memappend_fast(p, bufptr, strlen(bufptr)) + +static size_t printbuf_memappend_fast_n16(struct printbuf *kafka_line_buffer,const unsigned char value) + __attribute__((unused)); +static size_t printbuf_memappend_fast_n16(struct printbuf *kafka_line_buffer,const unsigned char value){ + static const char *hexbuf = "0123456789abcdef"; + printbuf_memappend_fast(kafka_line_buffer,&hexbuf[(value & 0xf0)>>4],1); + printbuf_memappend_fast(kafka_line_buffer,&hexbuf[(value & 0x0f)],1); + return 2; +} + +#define printbuf_length(p) ((p)->bpos) + +/** + * Set len bytes of the buffer to charvalue, starting at offset offset. + * Similar to calling memset(x, charvalue, len); + * + * The memory allocated for the buffer is extended as necessary. + * + * If offset is -1, this starts at the end of the current data in the buffer. + */ +extern int +printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len); + +extern int +sprintbuf(struct printbuf *p, const char *msg, ...); + +extern void +printbuf_reset(struct printbuf *p); + +extern void +printbuf_free(struct printbuf *p); + +#ifdef __cplusplus +} +#endif + +#endif From c550318ef517cb6c3686ea263ba34d3a56333a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Wed, 30 Sep 2015 16:11:46 +0000 Subject: [PATCH 150/198] Creating a thread in order to do kafka polls --- src/output-plugins/spo_alert_json.c | 31 ++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 05e0496..036308e 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -290,11 +290,13 @@ typedef struct _AlertJSONData #endif #ifdef HAVE_LIBRDKAFKA struct { + int do_poll; char *brokers,*topic; rd_kafka_t *rk; rd_kafka_conf_t *rk_conf; rd_kafka_topic_t *rkt; rd_kafka_topic_conf_t *rkt_conf; + pthread_t poll_thread; } kafka; #endif } AlertJSONData; @@ -738,7 +740,7 @@ static void KafkaMsgDelivered (rd_kafka_t *rk, RefcntPrintbuf *rprintbuf = msg_opaque; DEBUG_WRAP(if(RPRINTBUF_MAGIC!=rprintbuf->magic) - FatalError("msg_delivered:Not valid magic")); + FatalError("msg_delivered: Not valid magic")); if (unlikely(error_code)) ErrorMessage("rdkafka Message delivery failed: %s\n",rd_kafka_err2str(error_code)); @@ -748,6 +750,17 @@ static void KafkaMsgDelivered (rd_kafka_t *rk, DecRefcntPrintbuf(rprintbuf); } +static void *KafkaPollFuncion(void *vjsonData) +{ + AlertJSONData *jsonData = vjsonData; + while(rd_atomic_add(&jsonData->kafka.do_poll,0)) + { + rd_kafka_poll(jsonData->kafka.rk,500); + } + + return NULL; +} + static void AlertJsonKafkaDelayedInit (AlertJSONData *this) { char errstr[256]; @@ -773,6 +786,15 @@ static void AlertJsonKafkaDelayedInit (AlertJSONData *this) if(NULL==this->kafka.rkt) FatalError("It was not possible create a kafka topic %s\n",this->kafka.topic); + + rd_atomic_add(&this->kafka.do_poll,1); + const int rc = pthread_create(&this->kafka.poll_thread, NULL, + KafkaPollFuncion, this); + + if(rc != 0) + { + FatalError("Couln't create kafka poll thread"); + } } #endif @@ -788,6 +810,13 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) #ifdef HAVE_LIBRDKAFKA if(data->kafka.rk) { + rd_atomic_sub(&data->kafka.do_poll,1); + const int join_rc = pthread_join(data->kafka.poll_thread,NULL); + if(0 != join_rc) + { + ErrorMessage("Couldn't join poll_thread (%d)",join_rc); + } + while (rd_kafka_outq_len(data->kafka.rk) > 0) { rd_kafka_poll(data->kafka.rk, 100); From 5ab2438b26dd6120c4c3d99c59b1b0b8fb796d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Thu, 1 Oct 2015 15:42:44 +0000 Subject: [PATCH 151/198] More verbose kafka errors --- src/output-plugins/spo_alert_json.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 036308e..26ccba2 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -793,7 +793,10 @@ static void AlertJsonKafkaDelayedInit (AlertJSONData *this) if(rc != 0) { - FatalError("Couln't create kafka poll thread"); + char errbuf[512]; + + strerror_r(errno,errbuf,sizeof(errbuf)); + FatalError("Couln't create kafka poll thread: %s",errbuf); } } #endif @@ -2027,6 +2030,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO #ifdef HAVE_LIBRDKAFKA if(unlikely(NULL == jsonData->kafka.rk && NULL != jsonData->kafka.brokers)) { + /* Still not initialized */ AlertJsonKafkaDelayedInit(jsonData); } @@ -2044,8 +2048,9 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO * msg_opaque. */ rprintbuf); - if(produce_rc < 0) { - ErrorMessage("alert_json: Failed to produce message: %s", + if(produce_rc < 0) + { + ErrorMessage("alert_json: Failed to produce kafka message: %s", rd_kafka_err2str(rd_kafka_errno2err(errno))); DecRefcntPrintbuf(rprintbuf); } From d1de5ad0f7b2bd28c478c54807196f0d67236ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Thu, 1 Oct 2015 15:50:18 +0000 Subject: [PATCH 152/198] Adding http library to json output plugin --- src/output-plugins/spo_alert_json.c | 114 +++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 3 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 26ccba2..b47c660 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -25,11 +25,13 @@ * * Purpose: output plugin for json alerting * - * Arguments: [alert_file]+kafka://:@ + * Arguments: [alert_file]+[kafka://:@] [http://:/] * * Effect: * - * Alerts are sended to a kafka broker, using the port and topic given, plus to a alert file (if given). + * Alerts are sended to: + * * kafka broker, using the port and topic given, plus to a alert file (if given). + * * HTTP host, using http:// ot https:// version * * Comments: Allows use of json alerts with other output plugin types. * See doc/README.alert_json to more details @@ -85,6 +87,10 @@ #include #endif +#ifdef HAVE_LIBRBHTTP +#include +#endif + #include #include @@ -157,6 +163,8 @@ static const size_t initial_enrich_with_buf_len = 1024; #define LOG_BUFFER (30*K_BYTES) #define KAFKA_PROT "kafka://" +#define HTTP_PROT "http://" +#define HTTPS_PROT "https://" //#define KAFKA_TOPIC "rb_ips" #define FILENAME_KAFKA_SEPARATOR '+' #define BROKER_TOPIC_SEPARATOR '@' @@ -299,6 +307,14 @@ typedef struct _AlertJSONData pthread_t poll_thread; } kafka; #endif +#ifdef HAVE_LIBRBHTTP + struct { + int do_poll; + pthread_t poll_thread; + const char *url; + struct rb_http_handler_s *handler; + } http; +#endif } AlertJSONData; static const char *priority_name[] = {NULL, "high", "medium", "low", "very low"}; @@ -498,6 +514,14 @@ static AlertJSONData *AlertJSONParseArgs(char *args) RB_IF_CLEAN(kafka_str,kafka_str = SnortStrdup(tok),"%s(%i) param setted twice\n",tok,i); #else FatalError("alert_json: This barnyard was build with no librdkafka support."); +#endif + } + else if(!strncasecmp(tok, HTTP_PROT,strlen(HTTP_PROT)) || !strncasecmp(tok,HTTPS_PROT,strlen(HTTP_PROT))) + { +#ifdef HAVE_LIBRBHTTP + RB_IF_CLEAN(data->http.url,data->http.url = SnortStrdup(tok),"%s(%i) param setted twice\n",tok,i); +#else + FatalError("alert_json: This barnyard was build with no http support."); #endif } else if ( !strncasecmp(tok, "default", strlen("default")) && !data->jsonargs) @@ -801,6 +825,70 @@ static void AlertJsonKafkaDelayedInit (AlertJSONData *this) } #endif +#ifdef HAVE_LIBRBHTTP +static void HttpMsgDelivered(struct rb_http_handler_s * rb_http_handler, + int status_code, + const char * status_code_str, + char * buff,size_t len, + void * msg_opaque) +{ + RefcntPrintbuf *rprintbuf = msg_opaque; + + DEBUG_WRAP(if(RPRINTBUF_MAGIC!=rprintbuf->magic) + FatalError("msg_delivered: Not valid magic")); + + if (unlikely(status_code)) + ErrorMessage("http Message delivery failed: (%d)%s\n",status_code,status_code_str); + else if (unlikely(BcLogVerbose())) + LogMessage("http Message delivered (%zd bytes)\n", len); + + DecRefcntPrintbuf(rprintbuf); +} + +void *HttpPollFuncion(void *vjsonData) { + AlertJSONData *jsonData = vjsonData; + + while(rd_atomic_add(&jsonData->http.do_poll,0)) + { + rb_http_get_reports (jsonData->http.handler, + HttpMsgDelivered, 500); + } + + return NULL; +} + +static void AlertJsonHTTPDelayedInit (AlertJSONData *this) +{ + char errstr[256]; + + if(!this->http.url) + { + FatalError("%s called with NULL==this->http.url\n", + __FUNCTION__); + } + + this->http.handler = rb_http_handler (this->http.url, 10, 10000, errstr, sizeof(errstr)); + + if(NULL==this->http.handler) + { + FatalError("Failed to create new HTTP producer: %s\n",errstr); + } + + rd_atomic_add(&this->http.do_poll,1); + const int rc = pthread_create(&this->http.poll_thread, NULL, + HttpPollFuncion, this); + + if(rc != 0) + { + char errbuf[512]; + + strerror_r(errno,errbuf,sizeof(errbuf)); + FatalError("Couln't create http poll thread: %s",errbuf); + } + +} +#endif + static void AlertJSONCleanup(int signal, void *arg, const char* msg) { AlertJSONData *data = (AlertJSONData *)arg; @@ -2056,5 +2144,25 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO } } #endif -} +#ifdef HAVE_LIBRBHTTP + if(unlikely(NULL == jsonData->http.handler && NULL != jsonData->http.url)) + { + /* Still not initialized */ + AlertJsonHTTPDelayedInit(jsonData); + } + + if(NULL != jsonData->http.handler) + { + rb_http_produce (jsonData->http.handler, + printbuf->buf,printbuf->bpos, 0 /* No flags */,rprintbuf); + + if(0) + { + ErrorMessage("alert_json: Failed to produce HTTP message: %s", + rd_kafka_err2str(rd_kafka_errno2err(errno))); + DecRefcntPrintbuf(rprintbuf); + } + } +#endif +} From c342656a206527812c82a0faf89361a3c55adc22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 2 Oct 2015 06:30:13 +0000 Subject: [PATCH 153/198] Deleting kafka by default behavior --- src/output-plugins/spo_alert_json.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index b47c660..dfa2734 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -622,7 +622,6 @@ static AlertJSONData *AlertJSONParseArgs(char *args) /* DFEFAULT VALUES */ if ( !data->jsonargs ) data->jsonargs = SnortStrdup(DEFAULT_JSON); if ( !filename ) filename = ProcessFileOption(barnyard2_conf_for_parsing, DEFAULT_FILE); - if ( !kafka_str ) kafka_str = SnortStrdup(DEFAULT_KAFKA_BROKER); /* names-str assoc */ if(hostsListPath) FillHostsList(hostsListPath,&data->hosts,HOSTS); From 4098604145927349f75280bc82d9e05f0a863005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 2 Oct 2015 08:59:09 +0000 Subject: [PATCH 154/198] FIX: GeoIP_delete called twice --- src/output-plugins/spo_alert_json.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index dfa2734..2009f05 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -924,14 +924,24 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) } #endif +#ifdef HAVE_GEOIP if(data->gi) + { GeoIP_delete(data->gi); + } if(data->gi_org) + { GeoIP_delete(data->gi_org); + } if(data->gi6) + { GeoIP_delete(data->gi6); + } if(data->gi6_org) + { GeoIP_delete(data->gi6_org); + } +#endif // HAVE_GEOIP free(data->jsonargs); freeNumberStrAssocList(data->hosts); @@ -944,11 +954,6 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) free(iter); } - - #ifdef HAVE_GEOIP - if(data->gi) GeoIP_delete(data->gi); - if(data->gi_org) GeoIP_delete(data->gi_org); - #endif // GWO_IP /* free memory from SpoJSONData */ free(data); } From c79b80181313306c0d1fc09b2830e859f632f64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 2 Oct 2015 09:00:58 +0000 Subject: [PATCH 155/198] Added printbuf to src/rbutil/Makefile.in --- src/rbutil/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rbutil/Makefile.in b/src/rbutil/Makefile.in index 874098d..acf2685 100644 --- a/src/rbutil/Makefile.in +++ b/src/rbutil/Makefile.in @@ -196,7 +196,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies noinst_LIBRARIES = librbutil.a -librbutil_a_SOURCES = rb_kafka.c rb_kafka.h rb_numstrpair_list.h rb_numstrpair_list.c rb_unified2.c +librbutil_a_SOURCES = rb_printbuf.c rb_numstrpair_list.h rb_numstrpair_list.c rb_unified2.c all: all-am .SUFFIXES: From 9827bd8b3e342f47140086be103e3282835f9be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Tue, 13 Oct 2015 16:43:49 +0000 Subject: [PATCH 156/198] New properties http.max_connections and http.max_queued_messages --- src/output-plugins/spo_alert_json.c | 33 ++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 2009f05..f26c9da 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -89,6 +89,8 @@ #ifdef HAVE_LIBRBHTTP #include +#define MAX_HTTP_DEFAULT_CONECTIONS 10 +#define MAX_HTTP_DEFAULT_QUEUED_MESSAGES 10000 #endif #include @@ -309,6 +311,8 @@ typedef struct _AlertJSONData #endif #ifdef HAVE_LIBRBHTTP struct { + size_t max_connections; + size_t max_queued_messages; int do_poll; pthread_t poll_thread; const char *url; @@ -497,6 +501,11 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->kafka.rkt_conf = rd_kafka_topic_conf_new(); #endif +#ifdef HAVE_LIBRBHTTP + data->http.max_connections = MAX_HTTP_DEFAULT_CONECTIONS; + data->http.max_queued_messages = MAX_HTTP_DEFAULT_QUEUED_MESSAGES; +#endif + for (i = 0; i < num_toks; i++) { const char* tok = toks[i]; @@ -582,6 +591,27 @@ static AlertJSONData *AlertJSONParseArgs(char *args) file_name, file_line, tok); #endif } + else if(!strncasecmp(tok,"http.",strlen("http."))) + { +#ifndef HAVE_LIBRBHTTP + FatalError("alert_json: This plugin was not build using HTTP extensions"); +#else + char *end=NULL; + if(!strncmp(tok,"http.max_connections=",strlen("http.max_connections="))) + { + data->http.max_connections = strtoul(tok+strlen("http.max_connections="),&end,0); + } + else if (!strncmp(tok,"http.max_queued_messages=",strlen("http.max_queued_messages="))) + { + data->http.max_queued_messages = strtoul(tok+strlen("http.max_queued_messages="),&end,0); + } + + if(NULL == end || *end != '\0') + { + FatalError("alert_json: Cannot parse HTTP %s parameter: Invalid value",tok); + } +#endif + } else if(!strncasecmp(tok,"eth_vendors=",strlen("eth_vendors="))) { RB_IF_CLEAN(eth_vendors_path,eth_vendors_path = SnortStrdup(tok+strlen("eth_vendors=")),"%s(%i) param setted twice.\n",tok,i); @@ -866,7 +896,8 @@ static void AlertJsonHTTPDelayedInit (AlertJSONData *this) __FUNCTION__); } - this->http.handler = rb_http_handler (this->http.url, 10, 10000, errstr, sizeof(errstr)); + this->http.handler = rb_http_handler (this->http.url, this->http.max_connections, + this->http.max_queued_messages, errstr, sizeof(errstr)); if(NULL==this->http.handler) { From d6edceafa306c0153d18c4f71594270c2e5cdb14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Wed, 14 Oct 2015 17:27:00 +0000 Subject: [PATCH 157/198] Adapted barnyard2 to use librbhttp v1.0, and wrapping new properties --- src/output-plugins/spo_alert_json.c | 89 ++++++++++++++++++++++++----- 1 file changed, 74 insertions(+), 15 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index f26c9da..1ccfcee 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -311,8 +311,11 @@ typedef struct _AlertJSONData #endif #ifdef HAVE_LIBRBHTTP struct { - size_t max_connections; - size_t max_queued_messages; + long max_connections; + long max_queued_messages; + long conn_timeout; + long req_timeout; + long verbose; int do_poll; pthread_t poll_thread; const char *url; @@ -596,19 +599,32 @@ static AlertJSONData *AlertJSONParseArgs(char *args) #ifndef HAVE_LIBRBHTTP FatalError("alert_json: This plugin was not build using HTTP extensions"); #else + /// @TODO use a function char *end=NULL; if(!strncmp(tok,"http.max_connections=",strlen("http.max_connections="))) { - data->http.max_connections = strtoul(tok+strlen("http.max_connections="),&end,0); + data->http.max_connections = strtol(tok+strlen("http.max_connections="),&end,0); } else if (!strncmp(tok,"http.max_queued_messages=",strlen("http.max_queued_messages="))) { - data->http.max_queued_messages = strtoul(tok+strlen("http.max_queued_messages="),&end,0); + data->http.max_queued_messages = strtol(tok+strlen("http.max_queued_messages="),&end,0); + } + else if (!strncmp(tok,"http.conn_timeout=",strlen("http.conn_timeout="))) + { + data->http.conn_timeout = strtol(tok+strlen("http.conn_timeout="),&end,0); + } + else if (!strncmp(tok,"http.req_timeout=",strlen("http.req_timeout="))) + { + data->http.req_timeout = strtol(tok+strlen("http.req_timeout="),&end,0); + } + else if (!strncmp(tok,"http.verbose=",strlen("http.verbose="))) + { + data->http.verbose = strtol(tok+strlen("http.verbose="),&end,0); } if(NULL == end || *end != '\0') { - FatalError("alert_json: Cannot parse HTTP %s parameter: Invalid value",tok); + FatalError("alert_json: Cannot parse HTTP %s parameter: Invalid value\n",tok); } #endif } @@ -856,10 +872,11 @@ static void AlertJsonKafkaDelayedInit (AlertJSONData *this) #ifdef HAVE_LIBRBHTTP static void HttpMsgDelivered(struct rb_http_handler_s * rb_http_handler, - int status_code, - const char * status_code_str, - char * buff,size_t len, - void * msg_opaque) + int status_code, + long http_code, + const char * status_code_str, + char * buff,size_t len, + void * msg_opaque) { RefcntPrintbuf *rprintbuf = msg_opaque; @@ -867,9 +884,17 @@ static void HttpMsgDelivered(struct rb_http_handler_s * rb_http_handler, FatalError("msg_delivered: Not valid magic")); if (unlikely(status_code)) + { ErrorMessage("http Message delivery failed: (%d)%s\n",status_code,status_code_str); + } + else if(unlikely(http_code != 200)) + { + ErrorMessage("alert_json: HTTP server returned %ld code\n",http_code); + } else if (unlikely(BcLogVerbose())) + { LogMessage("http Message delivered (%zd bytes)\n", len); + } DecRefcntPrintbuf(rprintbuf); } @@ -886,8 +911,27 @@ void *HttpPollFuncion(void *vjsonData) { return NULL; } +static void HTTPHandlerSetLongOpt(struct rb_http_handler_s *handler, + const char *key,long val) +{ + char errstr[BUFSIZ]; + char valbuf[BUFSIZ]; + + snprintf(valbuf,sizeof(valbuf),"%ld",val); + + const int rc = rb_http_handler_set_opt(handler,key,valbuf,errstr, + sizeof(errstr)); + + if(rc != 0) + { + FatalError("alert_json: Couldn't set option %s to %ld: %s\n", + key, val, errstr); + } +} + static void AlertJsonHTTPDelayedInit (AlertJSONData *this) { + char errstr[256]; if(!this->http.url) @@ -896,8 +940,20 @@ static void AlertJsonHTTPDelayedInit (AlertJSONData *this) __FUNCTION__); } - this->http.handler = rb_http_handler (this->http.url, this->http.max_connections, - this->http.max_queued_messages, errstr, sizeof(errstr)); + this->http.handler = rb_http_handler_create (this->http.url, + errstr, sizeof(errstr)); + + HTTPHandlerSetLongOpt(this->http.handler, "HTTP_MAX_TOTAL_CONNECTIONS", + this->http.max_connections); + HTTPHandlerSetLongOpt(this->http.handler, "HTTP_TIMEOUT", + this->http.req_timeout); + HTTPHandlerSetLongOpt(this->http.handler, "HTTP_CONNTTIMEOUT", + this->http.conn_timeout); + HTTPHandlerSetLongOpt(this->http.handler, "HTTP_VERBOSE", + this->http.verbose); + HTTPHandlerSetLongOpt(this->http.handler, "RB_HTTP_MAX_MESSAGES", + this->http.max_queued_messages); + if(NULL==this->http.handler) { @@ -2189,13 +2245,16 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO if(NULL != jsonData->http.handler) { - rb_http_produce (jsonData->http.handler, - printbuf->buf,printbuf->bpos, 0 /* No flags */,rprintbuf); + char err[BUFSIZ]; + + const int rc = rb_http_produce (jsonData->http.handler, + printbuf->buf,printbuf->bpos, 0 /* No flags */,err,sizeof(err), + rprintbuf); - if(0) + if(rc != 0) { ErrorMessage("alert_json: Failed to produce HTTP message: %s", - rd_kafka_err2str(rd_kafka_errno2err(errno))); + err); DecRefcntPrintbuf(rprintbuf); } } From 284cdb8fbe31855e836275e4b347bf86adfb61ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Fri, 18 Dec 2015 13:18:53 +0000 Subject: [PATCH 158/198] Deleting deprecated comment --- src/output-plugins/spo_alert_json.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 1ccfcee..ed4e588 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -100,8 +100,6 @@ static const size_t initial_enrich_with_buf_len = 1024; -// Send object_name or not. -// Note: Always including ,sensor_name,domain_name,group_name,src_net_name,src_as_name,dst_net_name,dst_as_name //#define SEND_NAMES #define DEFAULT_JSON_0 "timestamp,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,\ From 81801dd8d2583852e0211a36ff4743a7cb7dc7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 21 Dec 2015 08:33:44 +0000 Subject: [PATCH 159/198] DEFAULT_JSON is now extracted from X_FUNCTION_TEMPLATE --- src/output-plugins/spo_alert_json.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index ed4e588..c00e721 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -100,16 +100,7 @@ static const size_t initial_enrich_with_buf_len = 1024; -//#define SEND_NAMES - -#define DEFAULT_JSON_0 "timestamp,sig_generator,sig_id,sig_rev,priority,classification,action,msg,payload,\ - l4_proto,src,src_net,src_net_name,src_as,src_as_name,dst,dst_net,dst_net_name,dst_as,dst_as_name,\ - l4_srcport,l4_dstport,ethsrc,ethdst,ethlen,ethlength_range,\ - arp_hw_saddr,arp_hw_sprot,arp_hw_taddr,arp_hw_tprot,vlan,vlan_priority,vlan_drop,\ - tcpflags,tcpseq,tcpack,tcplen,tcpwindow,ttl,tos,id,dgmlen,iplen,iplen_range,icmptype,icmpcode,icmpid,icmpseq" - #ifdef HAVE_GEOIP -#define FIELDS_GEOIP ",src_country,dst_country,src_country_code,dst_country_code" /* link with previous string */ #define X_RB_GEOIP \ _X(SRC_COUNTRY,"src_country","src_country",stringFormat,"N/A") \ _X(DST_COUNTRY,"dst_country","dst_country",stringFormat,"N/A") \ @@ -120,28 +111,22 @@ static const size_t initial_enrich_with_buf_len = 1024; _X(SRC_AS_NAME,"src_as_name","src_as_name",stringFormat,"N/A") \ _X(DST_AS_NAME,"dst_as_name","dst_as_name",stringFormat,"N/A") #else -#define FIELDS_GEOIP #define X_RB_GEOIP #endif #ifdef HAVE_RB_MAC_VENDORS -#define FIELDS_MAC_VENDORS ",ethsrc_vendor,ethdst_vendor" #define X_RB_MAC_VENDORS \ _X(ETHSRC_VENDOR,"ethsrc_vendor","ethsrc_vendor",stringFormat,"-") \ _X(ETHDST_VENDOR,"ethdst_vendor","ethdst_vendor",stringFormat,"-") #else -#define FIELDS_MAC_VENDORS #define X_RB_MAC_VENDORS #endif #ifdef SEND_NAMES -#define FIELDS_PROTO_NAMES ",l4_proto_name,src_name,dst_name,l4_srcport_name,l4_dstport_name,vlan_name" #else -#define FIELDS_PROTO_NAMES #endif #ifdef RB_EXTRADATA -#define FIELDS_EXTRADATA ",sha256,file_size,file_hostname,file_uri,email_sender,email_destinations" //email_headers not included #define X_RB_EXTRADATA \ _X(SHA256,"sha256","sha256",stringFormat,"-") \ _X(FILE_SIZE,"file_size","file_size",stringFormat,"-") \ @@ -151,12 +136,9 @@ static const size_t initial_enrich_with_buf_len = 1024; _X(EMAIL_DESTINATIONS,"email_destinations","email_destinations",stringFormat,"-") //_X(EMAIL_HEADERS,"email_headers","email_headers",stringFormat,"-") #else -#define FIELDS_EXTRADATA #define X_RB_EXTRADATA #endif -#define DEFAULT_JSON DEFAULT_JSON_0 FIELDS_GEOIP FIELDS_MAC_VENDORS FIELDS_PROTO_NAMES FIELDS_EXTRADATA - #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" #define DEFAULT_LIMIT (128*M_BYTES) @@ -165,7 +147,6 @@ static const size_t initial_enrich_with_buf_len = 1024; #define KAFKA_PROT "kafka://" #define HTTP_PROT "http://" #define HTTPS_PROT "https://" -//#define KAFKA_TOPIC "rb_ips" #define FILENAME_KAFKA_SEPARATOR '+' #define BROKER_TOPIC_SEPARATOR '@' @@ -242,6 +223,14 @@ typedef enum{ #undef _X }TEMPLATE_ID; +static const char DEFAULT_JSON0[] = + #define _X(a,b,c,d,e) "," b + X_FUNCTION_TEMPLATE + #undef _X + ; + +static const char *DEFAULT_JSON = DEFAULT_JSON0+1; // Not getting first comma + typedef enum{stringFormat,numericFormat} JsonPrintFormat; typedef struct{ From fd503def34cc3377670cb1bcb7278416ac642f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 21 Dec 2015 09:04:56 +0000 Subject: [PATCH 160/198] Added header to rb_numstrpair_list.h --- src/rbutil/rb_numstrpair_list.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rbutil/rb_numstrpair_list.h b/src/rbutil/rb_numstrpair_list.h index 4a776c4..30831e2 100644 --- a/src/rbutil/rb_numstrpair_list.h +++ b/src/rbutil/rb_numstrpair_list.h @@ -34,6 +34,8 @@ #include "sf_ip.h" #include "util.h" +#include + typedef struct _Number_str_assoc{ char * human_readable_str; /* Example: Google, tcp, ssh... */ char * number_as_str; /* Example: 8.8.8.8, 0x800, 22... String format*/ From 44ade9ca5b645e0981f726087dc4899627a91709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 21 Dec 2015 09:05:22 +0000 Subject: [PATCH 161/198] Cleaning headers of spo_alert_json.c --- src/output-plugins/spo_alert_json.c | 33 +++++------------------------ 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index c00e721..d29454d 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -42,21 +42,6 @@ #include "config.h" #endif -#include -#include -#include -#ifndef WIN32 -#include -#include -#include -#endif /* !WIN32 */ - -#ifdef HAVE_STRINGS_H -#include -#endif - -#include "decode.h" -#include "plugbase.h" #include "parser.h" #include "debug.h" #include "mstring.h" @@ -71,14 +56,16 @@ #include "rbutil/rb_numstrpair_list.h" #include "rbutil/rb_pointers.h" #include "rbutil/rb_unified2.h" -#include "errno.h" -#include "signal.h" -#include "log_text.h" #ifdef HAVE_RB_MAC_VENDORS #include "rb_mac_vendors.h" #endif +#include +#include +#include +#include + #ifdef HAVE_GEOIP #include "GeoIP.h" #endif // HAVE_GEOIP @@ -96,9 +83,6 @@ #include #include -#include "math.h" - -static const size_t initial_enrich_with_buf_len = 1024; #ifdef HAVE_GEOIP #define X_RB_GEOIP \ @@ -122,10 +106,6 @@ static const size_t initial_enrich_with_buf_len = 1024; #define X_RB_MAC_VENDORS #endif -#ifdef SEND_NAMES -#else -#endif - #ifdef RB_EXTRADATA #define X_RB_EXTRADATA \ _X(SHA256,"sha256","sha256",stringFormat,"-") \ @@ -141,8 +121,6 @@ static const size_t initial_enrich_with_buf_len = 1024; #define DEFAULT_FILE "alert.json" #define DEFAULT_KAFKA_BROKER "kafka://127.0.0.1@barnyard" -#define DEFAULT_LIMIT (128*M_BYTES) -#define LOG_BUFFER (30*K_BYTES) #define KAFKA_PROT "kafka://" #define HTTP_PROT "http://" @@ -216,7 +194,6 @@ static const size_t initial_enrich_with_buf_len = 1024; X_RB_GEOIP \ _X(TEMPLATE_END_ID,"","",numericFormat,"0") -/* If you change some of this, remember to change printElementWithTemplate too */ typedef enum{ #define _X(a,b,c,d,e) a, X_FUNCTION_TEMPLATE From c4bea6537728e6b2bd46244446a1b98105d81762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Wed, 13 Jan 2016 17:11:30 +0000 Subject: [PATCH 162/198] Deleted deprecated "type" and "trheader" template --- src/output-plugins/spo_alert_json.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index d29454d..41b1aef 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -134,7 +134,6 @@ #define X_FUNCTION_TEMPLATE \ _X(TIMESTAMP,"timestamp","timestamp",numericFormat,"0") \ _X(SENSOR_ID_SNORT,"sensor_id_snort","sensor_id_snort",numericFormat,"0") \ - _X(TYPE,"type","type",stringFormat,"-") \ _X(ACTION,"action","action",stringFormat,"-") \ _X(SIG_GENERATOR,"sig_generator","sig_generator",numericFormat,"0") \ _X(SIG_ID,"sig_id","sig_id",numericFormat,"0") \ @@ -161,7 +160,6 @@ _X(UDPLENGTH,"udplength","udplength",numericFormat,"0") \ _X(ETHLENGTH,"ethlen","ethlength",numericFormat,"0") \ _X(ETHLENGTH_RANGE,"ethlength_range","ethlength_range",stringFormat,"0") \ - _X(TRHEADER,"trheader","trheader",stringFormat,"-") \ _X(SRCPORT,"l4_srcport","src_port",numericFormat,"0") \ _X(SRCPORT_NAME,"l4_srcport_name","src_port_name",stringFormat,"-") \ _X(DSTPORT,"l4_dstport","dst_port",numericFormat,"0") \ From 63ef7a750eb21c4c8a4782e77110229cb421f061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Thu, 14 Jan 2016 07:16:37 +0000 Subject: [PATCH 163/198] Deleted AlertJSONConfig, never used --- src/output-plugins/spo_alert_json.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 41b1aef..53a2937 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -65,6 +65,7 @@ #include #include #include +#include #ifdef HAVE_GEOIP #include "GeoIP.h" @@ -221,11 +222,6 @@ typedef struct _TemplateElementsList{ struct _TemplateElementsList * next; } TemplateElementsList; -typedef struct _AlertJSONConfig{ - char *type; - struct _AlertJSONConfig *next; -} AlertJSONConfig; - static const uint64_t RPRINTBUF_MAGIC = 0x1ba1c1ba1c1ba1c; typedef struct _RefcntPrintbuf { @@ -248,7 +244,6 @@ typedef struct _AlertJSONData RefcntPrintbuf *curr_printbuf; char * jsonargs; TemplateElementsList * outputTemplate; - AlertJSONConfig *config; Number_str_assoc * hosts, *nets, *services, *protocols, *vlans; char *enrich_with; #ifdef HAVE_GEOIP From d19a0ee7c421beae2db4e39ea8d3c12b65967cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Thu, 14 Jan 2016 07:39:04 +0000 Subject: [PATCH 164/198] Created output_template functions that abstract TAILQ behavior --- src/output-plugins/spo_alert_json.c | 46 +++++++++++++++++++---------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 53a2937..a0f69c4 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -217,10 +217,16 @@ typedef struct{ char * defaultValue; } AlertJSONTemplateElement; -typedef struct _TemplateElementsList{ +typedef struct _TemplateElement{ AlertJSONTemplateElement * templateElement; - struct _TemplateElementsList * next; -} TemplateElementsList; + TAILQ_ENTRY(_TemplateElement) qentry; +} TemplateElement; + +#define OutputTemplate TAILQ_HEAD(,_TemplateElement) +#define output_template_init TAILQ_INIT +#define output_template_append(t,elm) TAILQ_INSERT_TAIL(t,elm,qentry) +#define output_template_first(t) TAILQ_FIRST(t) +#define output_template_foreach(elm,t) TAILQ_FOREACH(elm,t,qentry) static const uint64_t RPRINTBUF_MAGIC = 0x1ba1c1ba1c1ba1c; @@ -243,7 +249,7 @@ typedef struct _AlertJSONData { RefcntPrintbuf *curr_printbuf; char * jsonargs; - TemplateElementsList * outputTemplate; + OutputTemplate output_template; Number_str_assoc * hosts, *nets, *services, *protocols, *vlans; char *enrich_with; #ifdef HAVE_GEOIP @@ -636,16 +642,24 @@ static AlertJSONData *AlertJSONParseArgs(char *args) mSplitFree(&toks, num_toks); toks = mSplit(data->jsonargs, ",", 128, &num_toks, 0); + output_template_init(&data->output_template); + for(i=0;ioutputTemplate; - while(*templateIterator!=NULL) templateIterator=&(*templateIterator)->next; - *templateIterator = SnortAlloc(sizeof(TemplateElementsList)); - (*templateIterator)->templateElement = &template[j]; + TemplateElement *elm = SnortAlloc(sizeof(elm[0])); + if (NULL != elm) + { + elm->templateElement = &template[j]; + output_template_append(&data->output_template,elm); + } + else + { + FatalError("alert_json: Cannot allocate template element (out of memory?)\n"); + } break; } } @@ -935,7 +949,7 @@ static void AlertJsonHTTPDelayedInit (AlertJSONData *this) static void AlertJSONCleanup(int signal, void *arg, const char* msg) { AlertJSONData *data = (AlertJSONData *)arg; - TemplateElementsList *iter,*aux; + TemplateElement *template_element = NULL; /* close alert file */ DEBUG_WRAP(DebugMessage(DEBUG_LOG,"%s\n", msg);); @@ -993,9 +1007,9 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) freeNumberStrAssocList(data->services); freeNumberStrAssocList(data->protocols); freeNumberStrAssocList(data->vlans); - for(iter=data->outputTemplate;iter;iter=aux){ - aux = iter->next; - free(iter); + while((template_element = output_template_first(&data->output_template))) + { + free(template_element); } /* free memory from SpoJSONData */ @@ -2108,7 +2122,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, */ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSONData * jsonData) { - TemplateElementsList * iter; + TemplateElement * iter; RefcntPrintbuf *rprintbuf = calloc(1,sizeof(*rprintbuf)); if(NULL == rprintbuf) { @@ -2130,11 +2144,13 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging JSON Alert data\n");); printbuf_memappend_fast_str(printbuf,"{"); - for(iter=jsonData->outputTemplate;iter;iter=iter->next) + output_template_foreach(iter,&jsonData->output_template) { const int initial_pos = printbuf->bpos; - if(iter!=jsonData->outputTemplate) + if (iter!=output_template_first(&jsonData->output_template)) + { printbuf_memappend_fast_str(printbuf,JSON_FIELDS_SEPARATOR); + } printbuf_memappend_fast_str(printbuf,"\""); printbuf_memappend_fast_str(printbuf,iter->templateElement->jsonName); From 55eb651009c2cb3406364c9de75144fd6b3a832b Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Mon, 25 Jan 2016 16:51:56 +0000 Subject: [PATCH 165/198] New extraData: EVENT_INFO_FTP_USER --- src/output-plugins/spo_alert_json.c | 15 ++++++++++++++- src/unified2.h | 5 +++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index a0f69c4..7ff6695 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -114,7 +114,8 @@ _X(FILE_HOSTNAME,"file_hostname","file_hostname",stringFormat,"-") \ _X(FILE_URI,"file_uri","file_uri",stringFormat,"-") \ _X(EMAIL_SENDER,"email_sender","email_sender",stringFormat,"-") \ - _X(EMAIL_DESTINATIONS,"email_destinations","email_destinations",stringFormat,"-") + _X(EMAIL_DESTINATIONS,"email_destinations","email_destinations",stringFormat,"-") \ + _X(FTP_USER,"ftp_user","ftp_user",stringFormat,"-") //_X(EMAIL_HEADERS,"email_headers","email_headers",stringFormat,"-") #else #define X_RB_EXTRADATA @@ -1513,6 +1514,17 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, printbuf_memappend_fast(printbuf, str, len); } break; + + case FTP_USER: + if (event_info == EVENT_INFO_FTP_USER) + { + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + printbuf_memappend_fast(printbuf, str, len); + } + break; + + /* case EMAIL_HEADERS: if (event_info == EVENT_INFO_FILE_MAILHEADERS) @@ -1704,6 +1716,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case FILE_HOSTNAME: case EMAIL_SENDER: case EMAIL_DESTINATIONS: + case FTP_USER: //case EMAIL_HEADERS: if (event != NULL) printElementExtraData(event, event_type, templateElement, printbuf); diff --git a/src/unified2.h b/src/unified2.h index 915d98e..fecda68 100644 --- a/src/unified2.h +++ b/src/unified2.h @@ -191,10 +191,11 @@ typedef enum _EventInfoEnum EVENT_INFO_FILE_HOSTNAME, /* 17 */ EVENT_INFO_FILE_MAILFROM, /* 18 */ EVENT_INFO_FILE_RCPTTO, /* 19 */ - EVENT_INFO_FILE_EMAIL_HDRS /* 20 */ + EVENT_INFO_FILE_EMAIL_HDRS, /* 20 */ #else - EVENT_INFO_GZIP_DATA + EVENT_INFO_GZIP_DATA, #endif + EVENT_INFO_FTP_USER }EventInfoEnum; typedef enum _EventDataType From 852945dd6482230f789ab7e60bf0039017358624 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Wed, 27 Jan 2016 13:47:47 +0000 Subject: [PATCH 166/198] extradata: EVENT_INFO_SMB_UID EVENT_INFO_SMB_IS_UPLOAD --- src/output-plugins/spo_alert_json.c | 34 ++++++++++++++++++++++++++++- src/unified2.h | 4 +++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 7ff6695..72f90e1 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -115,7 +115,9 @@ _X(FILE_URI,"file_uri","file_uri",stringFormat,"-") \ _X(EMAIL_SENDER,"email_sender","email_sender",stringFormat,"-") \ _X(EMAIL_DESTINATIONS,"email_destinations","email_destinations",stringFormat,"-") \ - _X(FTP_USER,"ftp_user","ftp_user",stringFormat,"-") + _X(FTP_USER,"ftp_user","ftp_user",stringFormat,"-") \ + _X(SMB_UID,"smb_uid","smb_uid", numericFormat, "0") \ + _X(SMB_UPLOAD,"smb_upload","smb_upload",numericFormat,"-") //_X(EMAIL_HEADERS,"email_headers","email_headers",stringFormat,"-") #else #define X_RB_EXTRADATA @@ -1523,7 +1525,35 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, printbuf_memappend_fast(printbuf, str, len); } break; + case SMB_UID: + if (event_info == EVENT_INFO_SMB_UID) { + { + char buf[sizeof "00"]; + const size_t buflen = sizeof buf; + uint16_t uid = ntohs(*(uint16_t *)(U2ExtraData+1)); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + printbuf_memappend_fast_str(printbuf, itoa10(uid, buf, buflen)); + } + } + break; + case SMB_UPLOAD: + if (event_info == EVENT_INFO_SMB_IS_UPLOAD) { + { + const char * true_str = "true"; + const char * false_str = "false"; + char buf[sizeof "0"]; + const size_t buflen = sizeof buf; + uint8_t uid = *((uint8_t *)(U2ExtraData+1)); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + itoa10(uid, buf, buflen); + if (strcmp(buf, "0") == 0) + printbuf_memappend_fast(printbuf, false_str, strlen(false_str)); + else + printbuf_memappend_fast(printbuf, true_str, strlen(true_str)); + } + } + break; /* case EMAIL_HEADERS: @@ -1717,6 +1747,8 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case EMAIL_SENDER: case EMAIL_DESTINATIONS: case FTP_USER: + case SMB_UID: + case SMB_UPLOAD: //case EMAIL_HEADERS: if (event != NULL) printElementExtraData(event, event_type, templateElement, printbuf); diff --git a/src/unified2.h b/src/unified2.h index fecda68..20c9e5d 100644 --- a/src/unified2.h +++ b/src/unified2.h @@ -195,7 +195,9 @@ typedef enum _EventInfoEnum #else EVENT_INFO_GZIP_DATA, #endif - EVENT_INFO_FTP_USER + EVENT_INFO_FTP_USER, /* 21 */ + EVENT_INFO_SMB_UID, /* 22 */ + EVENT_INFO_SMB_IS_UPLOAD, /* 23 */ }EventInfoEnum; typedef enum _EventDataType From 75da5207955bd79fb217bd8715a7b7cdd9794d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 1 Feb 2016 13:12:48 +0000 Subject: [PATCH 167/198] Added compiled, configure, Makefile.in, and compile script to git --- Makefile.in | 814 ++ compile | 347 + configure | 18998 +++++++++++++++++++++++++++++++ doc/Makefile.in | 438 + etc/Makefile.in | 443 + m4/Makefile.in | 440 + rpm/Makefile.in | 442 + schemas/Makefile.in | 444 + src/Makefile.in | 759 ++ src/input-plugins/Makefile.in | 566 + src/output-plugins/Makefile.in | 598 + src/sfutil/Makefile.in | 580 + 12 files changed, 24869 insertions(+) create mode 100644 Makefile.in create mode 100755 compile create mode 100755 configure create mode 100644 doc/Makefile.in create mode 100644 etc/Makefile.in create mode 100644 m4/Makefile.in create mode 100644 rpm/Makefile.in create mode 100644 schemas/Makefile.in create mode 100644 src/Makefile.in create mode 100644 src/input-plugins/Makefile.in create mode 100644 src/output-plugins/Makefile.in create mode 100644 src/sfutil/Makefile.in diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..2ce2dff --- /dev/null +++ b/Makefile.in @@ -0,0 +1,814 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = . +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in COPYING README compile config.guess \ + config.sub install-sh missing ltmain.sh +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +depcomp = +am__depfiles_maybe = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +CSCOPE = cscope +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +DIST_TARGETS = dist-gzip +distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INCLUDES = @INCLUDES@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TCLSH = @TCLSH@ +VERSION = @VERSION@ +YACC = @YACC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +extra_incl = @extra_incl@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign no-dependencies +ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = src etc doc rpm schemas m4 +EXTRA_DIST = COPYING LICENSE README RELEASE.NOTES ltmain.sh autogen.sh +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +am--refresh: Makefile + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + $(am__cd) $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): + +config.h: stamp-h1 + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool config.lt + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + +distdir: $(DISTFILES) + $(am__remove_distdir) + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__post_remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) + +dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + +dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__post_remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__post_remove_distdir) + +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ + && ../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 + $(am__post_remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-recursive +all-am: Makefile config.h +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-hdr \ + distclean-libtool distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/compile b/compile new file mode 100755 index 0000000..531136b --- /dev/null +++ b/compile @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# 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, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/configure b/configure new file mode 100755 index 0000000..3fc495e --- /dev/null +++ b/configure @@ -0,0 +1,18998 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.69. +# +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + +SHELL=${CONFIG_SHELL-/bin/sh} + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= +PACKAGE_URL= + +ac_unique_file="src/barnyard2.c" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS +LIBOBJS +INCLUDES +TCLSH +LIBPRELUDE_CONFIG_PREFIX +LIBPRELUDE_PREFIX +LIBPRELUDE_LIBS +LIBPRELUDE_LDFLAGS +LIBPRELUDE_PTHREAD_CFLAGS +LIBPRELUDE_CFLAGS +LIBPRELUDE_CONFIG +HAVE_SUP_IP6_FALSE +HAVE_SUP_IP6_TRUE +LEX +YACC +extra_incl +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE +CPP +OTOOL64 +OTOOL +LIPO +NMEDIT +DSYMUTIL +MANIFEST_TOOL +RANLIB +ac_ct_AR +AR +DLLTOOL +OBJDUMP +LN_S +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP +EGREP +GREP +SED +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +LIBTOOL +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_silent_rules +enable_shared +enable_static +with_pic +enable_fast_install +enable_dependency_tracking +with_gnu_ld +with_sysroot +enable_libtool_lock +enable_maintainer_mode +enable_64bit_gcc +with_geo_ip_includes +with_geo_ip_libraries +enable_geo_ip +enable_extradata +with_macs_vendors_includes +with_macs_vendors_libraries +enable_rb_macs_vendors +with_rdkafka_includes +with_rdkafka_libraries +enable_kafka +enable_rb_http +with_rd_includes +with_rd_libraries +enable_rd +with_libpcap_includes +with_libpcap_libraries +with_libpfring_includes +with_libpfring_libraries +enable_ipv6 +enable_gre +enable_mpls +enable_prelude +with_libprelude_prefix +enable_debug +with_mysql +with_mysql_includes +with_mysql_libraries +enable_mysql_ssl_support +with_odbc +with_postgresql +with_pgsql_includes +with_oracle +enable_aruba +enable_bro +with_broccoli +with_tcl +enable_plugin_echidna +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures this package to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --disable-libtool-lock avoid locking (might break parallel builds) + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-64bit-gcc Try to compile 64bit (only tested on Sparc Solaris 9 and 10). + --enable-geo-ip Enable geo-ip localization. + --enable-extradata Enable ExtraData collection. + --enable-macs-vendors Enable geo-ip localization. + --enable-kafka Enable kafka messagin. + --enable-rb-http Enable HTTP POST json sending. + --enable-rd Enable librd extensions. + --enable-ipv6 Enable IPv6 support + --enable-gre Enable GRE and IP in IP encapsulation support + --enable-mpls Enable MPLS support + --enable-prelude Enable Prelude Hybrid IDS support + --enable-debug Enable debugging options (bugreports and developers only) + --enable-mysql-ssl-support Enable support for mysql SSL connections (experimental) + --enable-aruba Enable Aruba output plugin + --enable-bro Enable Bro output plugin + --enable-plugin-echidna Enable echidna plugin (experimental) + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + --with-geo-ip-includes=DIR Maxmind geoip include directory + --with-geo-ip-libraries=DIR Maxmind geoip library directory + --with-macs-vendors-include=DIR librb_macs_vendors include directory + --with-macs-vendors-libraries=DIR librb_macs_vendors library directory + --with-rdkafka-includes=DIR rdkafka include directory + --with-rdkfaka-libraries=DIR rdkafka library directory + --with-rd-includes=DIR rd include directory + --with-rdkfaka-libraries=DIR rd library directory + --with-libpcap-includes=DIR libpcap include directory + --with-libpcap-libraries=DIR libpcap library directory + --with-libpfring-includes=DIR libpfring include directory + --with-libpfring-libraries=DIR libpfring library directory + --with-libprelude-prefix=PFX + Prefix where libprelude is installed (optional) + --with-mysql=DIR Support for MySQL + --with-mysql-includes=DIR MySQL include directory + --with-mysql-libraries=DIR MySQL library directory + --with-odbc=DIR Support for ODBC + --with-postgresql=DIR Support for PostgreSQL + --with-pgsql-includes=DIR PostgreSQL include directory + --with-oracle=DIR Support for Oracle + --with-broccoli=DIR Prefix where libbroccoli is installed + for Bro output plugin support (optional) + --with-tcl=DIR support for Tcl + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to the package provider. +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +configure +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +else + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 &5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_type +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by $as_me, which was +generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +ac_config_headers="$ac_config_headers config.h" + +am__api_version='1.14' + +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + + PACKAGE=barnyard2 + VERSION=1.13 + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + + +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac + + + +macro_version='2.4.2' +macro_revision='1.3337' + + + + + + + + + + + + + +ltmain="$ac_aux_dir/ltmain.sh" + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_FGREP" || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_FGREP=$FGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +test -z "$GREP" && GREP=grep + + + + + + + + + + + + + + + + + + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$DUMPBIN" && break + done +fi +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in dumpbin "link -dump" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_DUMPBIN" && break +done + + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DUMPBIN=$ac_ct_DUMPBIN + fi +fi + + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi + + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi + +# find the maximum length of command line arguments +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 +else + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac + +fi + +if test -n $lt_cv_sys_max_cmd_len ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } +fi +max_cmd_len=$lt_cv_sys_max_cmd_len + + + + + + +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +lt_shell_append=no +( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } + + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi + + + + + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + +test -z "$OBJDUMP" && OBJDUMP=objdump + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. + +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +beos*) + lt_cv_deplibs_check_method=pass_all + ;; + +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + + + + + + + + + + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} +: ${AR_FLAGS=cru} + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +test -z "$STRIP" && STRIP=: + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +test -z "$RANLIB" && RANLIB=: + + + + + + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# Check for command to grab the raw symbol name followed by C symbol from nm. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 +else + +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[BCDEGRST]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[BCDT]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[ABCDEGRST]' + fi + ;; +irix* | nonstopux*) + symcode='[BCDEGRST]' + ;; +osf*) + symcode='[BCDEGQRST]' + ;; +solaris*) + symcode='[BDRT]' + ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; +sysv4) + symcode='[DFNSTU]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 + fi + else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done + +fi + +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes +else + lt_cv_cc_needs_belf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks="$enable_libtool_lock" + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +set dummy ${ac_tool_prefix}lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LIPO="lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_LIPO" = x; then + LIPO=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LIPO=$ac_ct_LIPO + fi +else + LIPO="$ac_cv_prog_LIPO" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL="otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL=$ac_ct_OTOOL + fi +else + OTOOL="$ac_cv_prog_OTOOL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL64="otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL64=$ac_ct_OTOOL64 + fi +else + OTOOL64="$ac_cv_prog_OTOOL64" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes +else + lt_cv_ld_exported_symbols_list=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF + +fi + +done + + + + + +# Set options + + + + enable_dlopen=no + + + enable_win32_dll=no + + + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_shared=yes +fi + + + + + + + + + + # Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=yes +fi + + + + + + + + + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + pic_mode=default +fi + + +test -z "$pic_mode" && pic_mode=default + + + + + + + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_fast_install=yes +fi + + + + + + + + + + + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +test -z "$LN_S" && LN_S="ln -s" + + + + + + + + + + + + + + +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir + + + + + +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF + + + + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + + +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + else + MAGIC_CMD=: + fi +fi + + fi + ;; +esac + +# Use C for the default configuration in the libtool script + +lt_save_CC="$CC" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +objext=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* + + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + +lt_prog_compiler_no_builtin_flag= + +if test "$GCC" = yes; then + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +else + : +fi + +fi + + + + + + + lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= + + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; + + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; + + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; + + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi + +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac +else + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no +fi + +fi + + + + + + + + + + + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } + +if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= +fi + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + ld_shlibs=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; + + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='${wl}-f,' + + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac + ;; + + darwin* | rhapsody*) + + + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec='' + fi + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + + else + ld_shlibs=no + fi + + ;; + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; + + *nto* | *qnx*) + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no + fi + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; + + solaris*) + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; + esac + link_all_deplibs=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + ;; + esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' + ;; + esac + fi + fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no + +with_gnu_ld=$with_gnu_ld + + + + + + + + + + + + + + + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + ;; + esac + fi + ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[4-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[23].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[3-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } + +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + + + + + + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes +else + ac_cv_lib_dld_shl_load=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes +else + ac_cv_lib_svld_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes +else + ac_cv_lib_dld_dld_link=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + + + + + + + + + + + + + + + + +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac +fi + + + + + + + + + + + + + # Report which library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } + + + + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + + + + + + + + + + + + + + + ac_config_commands="$ac_config_commands libtool" + + + + +# Only expand once: + + + +NO_OPTIMIZE="no" +ADD_WERROR="no" + +# Test for -Werror and sed it out for now since some of the auto tests, +# for example AC_CHECK_LIB, will fail because of +# warning: conflicting types for built-in function +if eval "echo $CFLAGS | grep -e -Werror"; then + CFLAGS=`echo $CFLAGS | sed -e "s/-Werror//g"` + ADD_WERROR="yes" +fi + +# Disable annoying practice of recursively re-running the autotools + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + + case $ac_cv_prog_cc_stdc in #( + no) : + ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #( + *) : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if ${ac_cv_prog_cc_c99+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} + +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno; then : + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 +else + ac_cv_prog_cc_stdc=no +fi + +fi + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5 +$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; } + if ${ac_cv_prog_cc_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +fi + + case $ac_cv_prog_cc_stdc in #( + no) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; #( + '') : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; #( + *) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5 +$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;; +esac + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if ${ac_cv_c_bigendian+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + +int +main () +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + +int +main () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +else + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ +#ifndef _BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +else + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; + +int +main () +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_c_bigendian=no +else + ac_cv_c_bigendian=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h +;; #( + no) + ;; #( + universal) + +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + + ;; #( + *) + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + + +#AC_CANONICAL_HOST +linux="no" +sunos4="no" + +case "$host" in + *-openbsd2.6|*-openbsd2.5|*-openbsd2.4|*-openbsd2.3*) + +$as_echo "#define OPENBSD 1" >>confdefs.h + + +$as_echo "#define BROKEN_SIOCGIFMTU 1" >>confdefs.h + + + ;; + *-openbsd*) + +$as_echo "#define OPENBSD 1" >>confdefs.h + + + ;; + *-sgi-irix5*) + +$as_echo "#define IRIX 1" >>confdefs.h + + no_libsocket="yes" + no_libnsl="yes" + if test -z "$GCC"; then + sgi_cc="yes" + fi + LDFLAGS="${LDFLAGS} -L/usr/local/lib" + extra_incl="-I/usr/local/include" + ;; + *-sgi-irix6*) + +$as_echo "#define IRIX 1" >>confdefs.h + + no_libsocket="yes" + no_libnsl="yes" + if test -z "$GCC"; then + sgi_cc="yes" + fi + LDFLAGS="${LDFLAGS} -L/usr/local/lib" + extra_incl="-I/usr/local/include" + ;; + *-solaris*) + +$as_echo "#define SOLARIS 1" >>confdefs.h + + CPPFLAGS="${CPPFLAGS} -DBSD_COMP -D_REENTRANT" + ;; + *-sunos*) + +$as_echo "#define SUNOS 1" >>confdefs.h + + sunos4="yes" + ;; + *-linux*) + linux="yes" + +$as_echo "#define LINUX 1" >>confdefs.h + + # libpcap doesn't even LOOK at the timeout you give it under Linux + +$as_echo "#define PCAP_TIMEOUT_IGNORED 1" >>confdefs.h + + + extra_incl="-I/usr/include/pcap" + ;; + *-hpux10*|*-hpux11*) + +$as_echo "#define HPUX 1" >>confdefs.h + + +$as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h + + + extra_incl="-I/usr/local/include" + ;; + + *-freebsd*) + +$as_echo "#define FREEBSD 1" >>confdefs.h + + + ;; + *-bsdi*) + +$as_echo "#define BSDI 1" >>confdefs.h + + ;; + *-aix*) + +$as_echo "#define AIX 1" >>confdefs.h + + ;; + *-osf4*) + +$as_echo "#define OSF1 1" >>confdefs.h + + ;; + *-osf5.1*) + +$as_echo "#define OSF1 1" >>confdefs.h + + ;; + *-tru64*) + +$as_echo "#define OSF1 1" >>confdefs.h + + ;; +# it is actually -apple-darwin1.2 or -apple-rhapsody5.x but lets stick with this for the moment + *-apple*) + +$as_echo "#define MACOS 1" >>confdefs.h + + +$as_echo "#define BROKEN_SIOCGIFMTU 1" >>confdefs.h + + LDFLAGS="${LDFLAGS} -L/sw/lib" + extra_incl="-I/sw/include" + ;; + *-cygwin*) + +$as_echo "#define CYGWIN 1" >>confdefs.h + + ;; +esac + +# This is really meant for Solaris Sparc v9 where it has 32bit and 64bit +# capability but builds 32bit by default +# Check whether --enable-64bit-gcc was given. +if test "${enable_64bit_gcc+set}" = set; then : + enableval=$enable_64bit_gcc; enable_64bit_gcc="$enableval" +else + enable_64bit_gcc="no" +fi + +if test "x$enable_64bit_gcc" = "xyes"; then + CFLAGS="$CFLAGS -m64" +fi + + +# Check whether --with-geo_ip_includes was given. +if test "${with_geo_ip_includes+set}" = set; then : + withval=$with_geo_ip_includes; with_geoip_includes="$withval" +else + with_geoip_includes="no" +fi + + + +# Check whether --with-geo_ip_libraries was given. +if test "${with_geo_ip_libraries+set}" = set; then : + withval=$with_geo_ip_libraries; with_geoip_libraries="$withval" +else + with_geoip_libraries="no" +fi + + +if test "x$with_geoip_includes" != "xno"; then + CFLAGS="${CFLAGS} -I${with_geoip_includes}" +fi + +if test "x$with_geoip_libraries" != "xno"; then + LDFLAGS="${LDFLAGS} -L${with_geoip_libraries}" +fi + +# Check whether --enable-geo-ip was given. +if test "${enable_geo_ip+set}" = set; then : + enableval=$enable_geo_ip; enable_geo_ip="$enableval" +else + enable_geop_ip="no" +fi + +if test "x$enable_geo_ip" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + for ac_header in GeoIP.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default" +if test "x$ac_cv_header_GeoIP_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GEOIP_H 1 +_ACEOF + +else + + echo "Error: MaxMind GeoIP headers not found." + exit 1 + +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GeoIP_open in -lGeoIP" >&5 +$as_echo_n "checking for GeoIP_open in -lGeoIP... " >&6; } +if ${ac_cv_lib_GeoIP_GeoIP_open+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lGeoIP $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char GeoIP_open (); +int +main () +{ +return GeoIP_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_GeoIP_GeoIP_open=yes +else + ac_cv_lib_GeoIP_GeoIP_open=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GeoIP_GeoIP_open" >&5 +$as_echo "$ac_cv_lib_GeoIP_GeoIP_open" >&6; } +if test "x$ac_cv_lib_GeoIP_GeoIP_open" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBGEOIP 1 +_ACEOF + + LIBS="-lGeoIP $LIBS" + +else + + echo "Error: MaxMind GeoIP library not found." + exit 1 + +fi + + +cat >>confdefs.h <<_ACEOF +#define HAVE_GEOIP /**/ +_ACEOF + + LDFLAGS="$LDFLAGS -lGeoIP" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + +# Check whether --enable-extradata was given. +if test "${enable_extradata+set}" = set; then : + enableval=$enable_extradata; enable_extradata="$enableval" +else + enable_extradata="no" +fi + + +if test "x$enable_extradata" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<_ACEOF +#define RB_EXTRADATA /**/ +_ACEOF + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Check whether --with-macs-vendors-includes was given. +if test "${with_macs_vendors_includes+set}" = set; then : + withval=$with_macs_vendors_includes; with_macsvendors_includes="$withval" +else + with_macsvendors_includes="no" +fi + + + +# Check whether --with-macs-vendors-libraries was given. +if test "${with_macs_vendors_libraries+set}" = set; then : + withval=$with_macs_vendors_libraries; with_macsvendors_libraries="$withval" +else + with_macsvendors_libraries="no" +fi + + +if test "x$with_macsvendors_includes" != "xno"; then + CFLAGS="${CFLAGS} -I${with_macsvendors_includes}" +fi + +if test "x$with_macsvendors_libraries" != "xno"; then + LDFLAGS="${LDFLAGS} -L${with_macsvendors_libraries} -lrt -lz -lrd" +fi + +# Check whether --enable-rb-macs-vendors was given. +if test "${enable_rb_macs_vendors+set}" = set; then : + enableval=$enable_rb_macs_vendors; enable_macs_vendors="$enableval" +else + enable_macs_vendors="no" +fi + +if test "x$enable_macs_vendors" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + for ac_header in rb_mac_vendors.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "rb_mac_vendors.h" "ac_cv_header_rb_mac_vendors_h" "$ac_includes_default" +if test "x$ac_cv_header_rb_mac_vendors_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_RB_MAC_VENDORS_H 1 +_ACEOF + +else + + echo "Error: librb_mac_vendors headers not found." + exit 1 + +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rb_new_mac_vendor_db in -lrb_mac_vendors" >&5 +$as_echo_n "checking for rb_new_mac_vendor_db in -lrb_mac_vendors... " >&6; } +if ${ac_cv_lib_rb_mac_vendors_rb_new_mac_vendor_db+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrb_mac_vendors $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char rb_new_mac_vendor_db (); +int +main () +{ +return rb_new_mac_vendor_db (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rb_mac_vendors_rb_new_mac_vendor_db=yes +else + ac_cv_lib_rb_mac_vendors_rb_new_mac_vendor_db=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rb_mac_vendors_rb_new_mac_vendor_db" >&5 +$as_echo "$ac_cv_lib_rb_mac_vendors_rb_new_mac_vendor_db" >&6; } +if test "x$ac_cv_lib_rb_mac_vendors_rb_new_mac_vendor_db" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRB_MAC_VENDORS 1 +_ACEOF + + LIBS="-lrb_mac_vendors $LIBS" + +else + + echo "Error: librb_mac_vendors library not found." + exit 1 + +fi + + +cat >>confdefs.h <<_ACEOF +#define HAVE_RB_MAC_VENDORS /**/ +_ACEOF + + LDFLAGS="$LDFLAGS -lrb_mac_vendors" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Check whether --with-rdkafka_includes was given. +if test "${with_rdkafka_includes+set}" = set; then : + withval=$with_rdkafka_includes; with_rdkafka_includes="$withval" +else + with_rdkafka_includes="no" +fi + + + +# Check whether --with-rdkafka_libraries was given. +if test "${with_rdkafka_libraries+set}" = set; then : + withval=$with_rdkafka_libraries; with_rdkafka_libraries="$withval" +else + with_rdkafka_libraries="no" +fi + + +if test "x$with_rdkafka_includes" != "xno"; then + CFLAGS="${CFLAGS} -I${with_rdkafka_includes}" +fi + +if test "x$with_rdkafka_libraries" != "xno"; then + LDFLAGS="${LDFLAGS} -L${with_rdkafka_libraries}" +fi + +# Check whether --enable-kafka was given. +if test "${enable_kafka+set}" = set; then : + enableval=$enable_kafka; enable_kafka="$enableval" +else + enable_kafka="no" +fi + + +if test "x$enable_kafka" = "x$enableval"; then + for ac_header in librdkafka/rdkafka.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "librdkafka/rdkafka.h" "ac_cv_header_librdkafka_rdkafka_h" "$ac_includes_default" +if test "x$ac_cv_header_librdkafka_rdkafka_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRDKAFKA_RDKAFKA_H 1 +_ACEOF + +else + + echo "Error: Librdkafka headers not found." + echo "You can download and install it from https://github.com/edenhill/librdkafka" + exit 1 + +fi + +done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rd_kafka_new in -lrdkafka" >&5 +$as_echo_n "checking for rd_kafka_new in -lrdkafka... " >&6; } +if ${ac_cv_lib_rdkafka_rd_kafka_new+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrdkafka $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char rd_kafka_new (); +int +main () +{ +return rd_kafka_new (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rdkafka_rd_kafka_new=yes +else + ac_cv_lib_rdkafka_rd_kafka_new=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rdkafka_rd_kafka_new" >&5 +$as_echo "$ac_cv_lib_rdkafka_rd_kafka_new" >&6; } +if test "x$ac_cv_lib_rdkafka_rd_kafka_new" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRDKAFKA 1 +_ACEOF + + LIBS="-lrdkafka $LIBS" + +else + + echo "Error: Librdkafka library not found." + echo "You can download and install it from https://github.com/edenhill/librdkafka" + exit 1 + +fi + + + LDFLAGS="${LDFLAGS} -lrdkafka" +fi + +# Check whether --enable-rb-http was given. +if test "${enable_rb_http+set}" = set; then : + enableval=$enable_rb_http; enable_rbhttp="$enableval" +else + enable_rbhttp="no" +fi + + +if test "x$enable_rbhttp" = "x$enableval"; then + for ac_header in librbhttp/librb-http.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "librbhttp/librb-http.h" "ac_cv_header_librbhttp_librb_http_h" "$ac_includes_default" +if test "x$ac_cv_header_librbhttp_librb_http_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRBHTTP_LIBRB_HTTP_H 1 +_ACEOF + +else + + echo "Error: redBorder HTTP headers not found." + exit 1 + +fi + +done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rb_http_produce in -lrbhttp" >&5 +$as_echo_n "checking for rb_http_produce in -lrbhttp... " >&6; } +if ${ac_cv_lib_rbhttp_rb_http_produce+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrbhttp $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char rb_http_produce (); +int +main () +{ +return rb_http_produce (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rbhttp_rb_http_produce=yes +else + ac_cv_lib_rbhttp_rb_http_produce=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rbhttp_rb_http_produce" >&5 +$as_echo "$ac_cv_lib_rbhttp_rb_http_produce" >&6; } +if test "x$ac_cv_lib_rbhttp_rb_http_produce" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRBHTTP 1 +_ACEOF + + LIBS="-lrbhttp $LIBS" + +else + + echo "Error: redBorder HTTP library not found." + exit 1 + +fi + + + LDFLAGS="${LDFLAGS} -lrbhttp" +fi + + +# Check whether --with-rd_includes was given. +if test "${with_rd_includes+set}" = set; then : + withval=$with_rd_includes; with_rd_includes="$withval" +else + with_rd_includes="no" +fi + + + +# Check whether --with-rd_libraries was given. +if test "${with_rd_libraries+set}" = set; then : + withval=$with_rd_libraries; with_rd_libraries="$withval" +else + with_rd_libraries="no" +fi + + +if test "x$with_rd_includes" != "xno"; then + CFLAGS="${CFLAGS} -I${with_rd_includes}" +fi + +if test "x$with_rd_libraries" != "xno"; then + LDFLAGS="${LDFLAGS} -L${with_rd_libraries}" +fi + +# Check whether --enable-rd was given. +if test "${enable_rd+set}" = set; then : + enableval=$enable_rd; enable_rd="$enableval" +else + enable_rd="no" +fi + + +if test "x$enable_rd" = "x$enableval"; then + for ac_header in librd/rd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "librd/rd.h" "ac_cv_header_librd_rd_h" "$ac_includes_default" +if test "x$ac_cv_header_librd_rd_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRD_RD_H 1 +_ACEOF + +else + + echo "Error: Librd headers not found." + echo "You can download and install it from https://github.com/edenhill/librd" + exit 1 + +fi + +done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rd_init in -lrd" >&5 +$as_echo_n "checking for rd_init in -lrd... " >&6; } +if ${ac_cv_lib_rd_rd_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char rd_init (); +int +main () +{ +return rd_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rd_rd_init=yes +else + ac_cv_lib_rd_rd_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rd_rd_init" >&5 +$as_echo "$ac_cv_lib_rd_rd_init" >&6; } +if test "x$ac_cv_lib_rd_rd_init" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRD 1 +_ACEOF + + LIBS="-lrd $LIBS" + +else + + echo "Error: Librd library not found." + echo "You can download and install it from https://github.com/edenhill/librd" + exit 1 + +fi + + + LDFLAGS="${LDFLAGS} -lrd" +fi + + +# AC_PROG_YACC defaults to "yacc" when not found +# this check defaults to "none" +for ac_prog in bison yacc +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_YACC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_YACC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +YACC=$ac_cv_prog_YACC +if test -n "$YACC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +$as_echo "$YACC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$YACC" && break +done +test -n "$YACC" || YACC="none" + +# AC_PROG_YACC includes the -y arg if bison is found +if test "x$YACC" = "xbison"; then + YACC="$YACC -y" +fi + +# AC_PROG_LEX defaults to ":" when not found +# this check defaults to "none" +# We're using flex specific options so we don't support lex +for ac_prog in flex +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LEX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LEX"; then + ac_cv_prog_LEX="$LEX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LEX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +LEX=$ac_cv_prog_LEX +if test -n "$LEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 +$as_echo "$LEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$LEX" && break +done +test -n "$LEX" || LEX="none" + + +# + +for ac_header in strings.h string.h stdlib.h unistd.h sys/sockio.h paths.h inttypes.h wchar.h math.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 +$as_echo_n "checking for floor in -lm... " >&6; } +if ${ac_cv_lib_m_floor+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char floor (); +int +main () +{ +return floor (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_floor=yes +else + ac_cv_lib_m_floor=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 +$as_echo "$ac_cv_lib_m_floor" >&6; } +if test "x$ac_cv_lib_m_floor" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 +_ACEOF + + LIBS="-lm $LIBS" + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ceil in -lm" >&5 +$as_echo_n "checking for ceil in -lm... " >&6; } +if ${ac_cv_lib_m_ceil+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ceil (); +int +main () +{ +return ceil (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_ceil=yes +else + ac_cv_lib_m_ceil=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_ceil" >&5 +$as_echo "$ac_cv_lib_m_ceil" >&6; } +if test "x$ac_cv_lib_m_ceil" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 +_ACEOF + + LIBS="-lm $LIBS" + +fi + + +if test -z "$no_libnsl"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lnsl" >&5 +$as_echo_n "checking for inet_ntoa in -lnsl... " >&6; } +if ${ac_cv_lib_nsl_inet_ntoa+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char inet_ntoa (); +int +main () +{ +return inet_ntoa (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl_inet_ntoa=yes +else + ac_cv_lib_nsl_inet_ntoa=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_inet_ntoa" >&5 +$as_echo "$ac_cv_lib_nsl_inet_ntoa" >&6; } +if test "x$ac_cv_lib_nsl_inet_ntoa" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBNSL 1 +_ACEOF + + LIBS="-lnsl $LIBS" + +fi + +fi + +if test -z "$no_libsocket"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 +$as_echo_n "checking for socket in -lsocket... " >&6; } +if ${ac_cv_lib_socket_socket+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char socket (); +int +main () +{ +return socket (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_socket=yes +else + ac_cv_lib_socket_socket=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 +$as_echo "$ac_cv_lib_socket_socket" >&6; } +if test "x$ac_cv_lib_socket_socket" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSOCKET 1 +_ACEOF + + LIBS="-lsocket $LIBS" + +fi + +fi + +# SunOS4 has several things `broken' +if test "$sunos4" != "no"; then +for ac_func in vsnprintf +do : + ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" +if test "x$ac_cv_func_vsnprintf" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VSNPRINTF 1 +_ACEOF + +else + LIBS="$LIBS -ldb" +fi +done + +for ac_func in strtoul +do : + ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul" +if test "x$ac_cv_func_strtoul" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRTOUL 1 +_ACEOF + +else + LIBS="$LIBS -l44bsd" +fi +done + +fi + +# some funky macro to be backwards compatible with earlier autoconfs +# in current they have AC_CHECK_DECLS + + + + +# some stuff for declarations which were missed on sunos4 platform too. +# +# add `#undef NEED_DECL_FUNCTIONAME to acconfig.h` because autoheader +# fails to work properly with custom macroses. +# you will see also #undef for each SN_CHECK_DECLS macros invocation +# because autoheader doesn't execute shell script commands. +# it is possible to make loops using m4 but the code would look even +# more confusing.. +for sn_decl in printf fprintf syslog puts fputs fputc fopen \ + fclose fwrite fflush getopt bzero bcopy memset strtol \ + strcasecmp strncasecmp strerror perror socket sendto \ + vsnprintf snprintf strtoul +do +sn_def_decl=`echo $sn_decl | tr a-z A-Z` + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $sn_decl must be declared" >&5 +$as_echo_n "checking whether $sn_decl must be declared... " >&6; } +if eval \${sn_cv_decl_needed_$sn_decl+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef HAVE_STRING_H +#include +#endif +#ifdef HAVE_STRINGS_H +#include +#endif +#ifdef HAVE_STDLIB_H +#include +#endif +#ifdef HAVE_UNISTD_H +#include +#endif +#include +#include +#include + +int +main () +{ +char *(*pfn); pfn = (char *(*)) $sn_decl; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "sn_cv_decl_needed_$sn_decl=no" +else + eval "sn_cv_decl_needed_$sn_decl=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + + +if eval "test \"`echo '$sn_cv_decl_needed_'$sn_decl`\" != no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + +cat >>confdefs.h <<_ACEOF +#define NEED_DECL_$sn_def_decl 1 +_ACEOF + + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +done + + +for ac_func in snprintf strlcpy strlcat strerror vswprintf wprintf +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5 +$as_echo_n "checking size of char... " >&6; } +if ${ac_cv_sizeof_char+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_char" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (char) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_char=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5 +$as_echo "$ac_cv_sizeof_char" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_CHAR $ac_cv_sizeof_char +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 +$as_echo_n "checking size of short... " >&6; } +if ${ac_cv_sizeof_short+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_short" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (short) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_short=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 +$as_echo "$ac_cv_sizeof_short" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SHORT $ac_cv_sizeof_short +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if ${ac_cv_sizeof_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_int=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 +$as_echo "$ac_cv_sizeof_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_INT $ac_cv_sizeof_int +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5 +$as_echo_n "checking size of long int... " >&6; } +if ${ac_cv_sizeof_long_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_long_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_int=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_int" >&5 +$as_echo "$ac_cv_sizeof_long_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5 +$as_echo_n "checking size of long long int... " >&6; } +if ${ac_cv_sizeof_long_long_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_long_long_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long long int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_long_int=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long_int" >&5 +$as_echo "$ac_cv_sizeof_long_long_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5 +$as_echo_n "checking size of unsigned int... " >&6; } +if ${ac_cv_sizeof_unsigned_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_unsigned_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (unsigned int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_int=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_int" >&5 +$as_echo "$ac_cv_sizeof_unsigned_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long int" >&5 +$as_echo_n "checking size of unsigned long int... " >&6; } +if ${ac_cv_sizeof_unsigned_long_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long int))" "ac_cv_sizeof_unsigned_long_int" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_unsigned_long_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (unsigned long int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_long_int=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long_int" >&5 +$as_echo "$ac_cv_sizeof_unsigned_long_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_LONG_INT $ac_cv_sizeof_unsigned_long_int +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long int" >&5 +$as_echo_n "checking size of unsigned long long int... " >&6; } +if ${ac_cv_sizeof_unsigned_long_long_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long int))" "ac_cv_sizeof_unsigned_long_long_int" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_unsigned_long_long_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (unsigned long long int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_long_long_int=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long_long_int" >&5 +$as_echo "$ac_cv_sizeof_unsigned_long_long_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int +_ACEOF + + + +# Check for int types +ac_fn_c_check_type "$LINENO" "u_int8_t" "ac_cv_type_u_int8_t" "$ac_includes_default" +if test "x$ac_cv_type_u_int8_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_U_INT8_T 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "u_int16_t" "ac_cv_type_u_int16_t" "$ac_includes_default" +if test "x$ac_cv_type_u_int16_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_U_INT16_T 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default" +if test "x$ac_cv_type_u_int32_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_U_INT32_T 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "$ac_includes_default" +if test "x$ac_cv_type_u_int64_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_U_INT64_T 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "$ac_includes_default" +if test "x$ac_cv_type_uint8_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT8_T 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default" +if test "x$ac_cv_type_uint16_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT16_T 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default" +if test "x$ac_cv_type_uint32_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT32_T 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "$ac_includes_default" +if test "x$ac_cv_type_uint64_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT64_T 1 +_ACEOF + + +fi + +ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "$ac_includes_default" +if test "x$ac_cv_type_int8_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_INT8_T 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default" +if test "x$ac_cv_type_int16_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_INT16_T 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default" +if test "x$ac_cv_type_int32_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_INT32_T 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default" +if test "x$ac_cv_type_int64_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_INT64_T 1 +_ACEOF + + +fi + + +# In case INADDR_NONE is not defined (like on Solaris) +have_inaddr_none="no" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INADDR_NONE" >&5 +$as_echo_n "checking for INADDR_NONE... " >&6; } +if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int +main () +{ + + if (inet_addr("10,5,2") == INADDR_NONE); + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + have_inaddr_none="yes" +else + have_inaddr_none="no" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_inaddr_none" >&5 +$as_echo "$have_inaddr_none" >&6; } +if test "x$have_inaddr_none" = "xno"; then + +$as_echo "#define INADDR_NONE -1" >>confdefs.h + +fi + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include + +int +main () +{ +const char *foo; foo = sys_errlist[0]; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define ERRLIST_PREDEFINED 1" >>confdefs.h + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__" >&5 +$as_echo_n "checking for __FUNCTION__... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include + +int +main () +{ +printf ("%s", __FUNCTION__); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + sn_cv_have___FUNCTION__=yes +else + sn_cv__have___FUNCTION__=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test "x$sn_cv_have___FUNCTION__" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE___FUNCTION__ 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__" >&5 +$as_echo_n "checking for __func__... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include + +int +main () +{ +printf ("%s", __func__); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + sn_cv_have___func__=yes +else + sn_cv__have___func__=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "x$sn_cv_have___func__" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE___func__ 1" >>confdefs.h + + +$as_echo "#define __FUNCTION__ __func__" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + $as_echo "#define __FUNCTION__ \"mystery function\"" >>confdefs.h + + fi +fi + + +# Check whether --with-libpcap_includes was given. +if test "${with_libpcap_includes+set}" = set; then : + withval=$with_libpcap_includes; with_libpcap_includes="$withval" +else + with_libpcap_includes="no" +fi + + + +# Check whether --with-libpcap_libraries was given. +if test "${with_libpcap_libraries+set}" = set; then : + withval=$with_libpcap_libraries; with_libpcap_libraries="$withval" +else + with_libpcap_libraries="no" +fi + + + +if test "x$with_libpcap_includes" != "xno"; then + CPPFLAGS="${CPPFLAGS} -I${with_libpcap_includes}" +fi + +if test "x$with_libpcap_libraries" != "xno"; then + LDFLAGS="${LDFLAGS} -L${with_libpcap_libraries}" +fi + +# --with-libpfring-* options + +# Check whether --with-libpfring_includes was given. +if test "${with_libpfring_includes+set}" = set; then : + withval=$with_libpfring_includes; with_libpfring_includes="$withval" +else + with_libpfring_includes="no" +fi + + + +# Check whether --with-libpfring_libraries was given. +if test "${with_libpfring_libraries+set}" = set; then : + withval=$with_libpfring_libraries; with_libpfring_libraries="$withval" +else + with_libpfring_libraries="no" +fi + + +if test "x$with_libpfring_includes" != "xno"; then + CPPFLAGS="${CPPFLAGS} -I${with_libpfring_includes}" +fi + +if test "x$with_libpfring_libraries" != "xno"; then + LDFLAGS="${LDFLAGS} -L${with_libpfring_libraries}" +fi + + +PCAP_HEADERS="" +# Test for pcap headers + +for ac_header in pcap.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "pcap.h" "ac_cv_header_pcap_h" "$ac_includes_default" +if test "x$ac_cv_header_pcap_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PCAP_H 1 +_ACEOF + +else + PCAP_HEADERS="no" +fi + +done + + +if test "x$PCAP_HEADERS" = "xno"; then + + if test "x$CYGWIN" = "x1" ; then + + + echo + echo " ERROR: You will need to get Winpcap headers in your path" + echo " Downlad from http://www.winpcap.org, uncompress it and copy" + echo " */Include/* to your include path (/usr/include)" + echo " or use the --with-libpcap-headers* options, if you have it installed" + echo " in unusual place." + echo + + exit 1 + + else + + echo + echo " ERROR! Libpcap headers (pcap.h)" + echo " not found, go get it from http://www.tcpdump.org" + echo " or use the --with-libpcap-headers=* options, if you have it installed" + echo " in unusual place." + echo + + exit 1 + + + fi + +fi + + +LPCAP="" + +if test "x$with_libpcap_libraries" != "xyes"; then + if test "x$CYGWIN" = "x1"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_datalink in -lwpcap" >&5 +$as_echo_n "checking for pcap_datalink in -lwpcap... " >&6; } +if ${ac_cv_lib_wpcap_pcap_datalink+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lwpcap $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pcap_datalink (); +int +main () +{ +return pcap_datalink (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_wpcap_pcap_datalink=yes +else + ac_cv_lib_wpcap_pcap_datalink=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wpcap_pcap_datalink" >&5 +$as_echo "$ac_cv_lib_wpcap_pcap_datalink" >&6; } +if test "x$ac_cv_lib_wpcap_pcap_datalink" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBWPCAP 1 +_ACEOF + + LIBS="-lwpcap $LIBS" + +else + LPCAP="no" +fi + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_datalink in -lpcap" >&5 +$as_echo_n "checking for pcap_datalink in -lpcap... " >&6; } +if ${ac_cv_lib_pcap_pcap_datalink+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcap $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pcap_datalink (); +int +main () +{ +return pcap_datalink (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pcap_pcap_datalink=yes +else + ac_cv_lib_pcap_pcap_datalink=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_datalink" >&5 +$as_echo "$ac_cv_lib_pcap_pcap_datalink" >&6; } +if test "x$ac_cv_lib_pcap_pcap_datalink" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPCAP 1 +_ACEOF + + LIBS="-lpcap $LIBS" + +else + LPCAP="no" +fi + + fi +fi + + +# If the normal AC_CHECK_LIB for pcap fails then check to see if we are +# using a pfring-enabled pcap. +if test "x$LPCAP" = "xno"; then + PFRING_H="" + for ac_header in pfring.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "pfring.h" "ac_cv_header_pfring_h" "$ac_includes_default" +if test "x$ac_cv_header_pfring_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PFRING_H 1 +_ACEOF + +else + PFRING_H="no" +fi + +done + + +# It is important to have the AC_CHECK_LIB for the pfring library BEFORE +# the one for pfring-enabled pcap. When the Makefile is created, all the +# libraries used during linking are added to the LIBS variable in the +# Makefile in the opposite orded that their AC_CHECK_LIB macros appear +# in configure.in. Durring linking, the pfring library (-lpfring) MUST come +# _after_ the libpcap library (-lpcap) or linking will fail. + PFRING_L="" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pfring_open in -lpfring" >&5 +$as_echo_n "checking for pfring_open in -lpfring... " >&6; } +if ${ac_cv_lib_pfring_pfring_open+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpfring $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pfring_open (); +int +main () +{ +return pfring_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pfring_pfring_open=yes +else + ac_cv_lib_pfring_pfring_open=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pfring_pfring_open" >&5 +$as_echo "$ac_cv_lib_pfring_pfring_open" >&6; } +if test "x$ac_cv_lib_pfring_pfring_open" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPFRING 1 +_ACEOF + + LIBS="-lpfring $LIBS" + +else + PFRING_L="no" +fi + + + LPFRING_PCAP="" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pfring_open in -lpcap" >&5 +$as_echo_n "checking for pfring_open in -lpcap... " >&6; } +if ${ac_cv_lib_pcap_pfring_open+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcap -lpfring $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pfring_open (); +int +main () +{ +return pfring_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pcap_pfring_open=yes +else + ac_cv_lib_pcap_pfring_open=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pfring_open" >&5 +$as_echo "$ac_cv_lib_pcap_pfring_open" >&6; } +if test "x$ac_cv_lib_pcap_pfring_open" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPCAP 1 +_ACEOF + + LIBS="-lpcap $LIBS" + +else + LPFRING_PCAP="no" +fi + +fi + +# If both the AC_CHECK_LIB for normal pcap and pfring-enabled pcap fail then exit. +if test "x$LPCAP" = "xno"; then + if test "x$LPFRING_PCAP" = "xno"; then + + if test "x$CYGWIN" = "1" ; then + + echo + echo " Warning: You will need to get Winpcap, install libraries and headers in your path " + echo " to compile barnyard2 with the output plugin LogTcpdump" + echo " Downlad from http://www.winpcap.org, uncompress it and copy */Lib/* to your lib path (/lib)" + echo " and */Include/* to your include path (/usr/include)" + echo " or use the --with-libpcap-* options, if you have it installed" + echo " in unusual place." + echo + + else + + echo + echo " Warning: you will need Libpcap library/headers (libpcap.a (or .so)/pcap.h) in your path" + echo " to compile barnyard2 with the output plugin LogTcpdump" + echo " You can download source from from http://www.tcpdump.org" + echo " or use the --with-libpcap-* options, if you have it installed" + echo " in unusual place." + echo + + + fi + + fi +fi + + + +# any sparc platform has to have this one defined. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sparc" >&5 +$as_echo_n "checking for sparc... " >&6; } +if eval "echo $host_cpu|grep -i sparc >/dev/null"; then + +$as_echo "#define WORDS_MUSTALIGN 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + # gcc, sparc and optimization not so good + if test -n "$GCC"; then + NO_OPTIMIZE="yes" + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + +# check for sparc %time register +if eval "echo $host_cpu|grep -i sparc >/dev/null"; then + OLD_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -mcpu=v9 " + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sparc %time register" >&5 +$as_echo_n "checking for sparc %time register... " >&6; } + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + int val; + __asm__ __volatile__("rd %%tick, %0" : "=r"(val)); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + sparcv9="yes" +else + sparcv9="no" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sparcv9" >&5 +$as_echo "$sparcv9" >&6; } + if test "x$sparcv9" = "xyes"; then + +$as_echo "#define SPARCV9 1" >>confdefs.h + + else + CFLAGS="$OLD_CFLAGS" + fi +fi + +# Check whether --enable-ipv6 was given. +if test "${enable_ipv6+set}" = set; then : + enableval=$enable_ipv6; enable_ipv6="$enableval" +else + enable_ipv6="no" +fi + +if test "x$enable_ipv6" = "xyes"; then + CPPFLAGS="$CPPFLAGS -DSUP_IP6" +fi + if test "x$enable_ipv6" = "xyes"; then + HAVE_SUP_IP6_TRUE= + HAVE_SUP_IP6_FALSE='#' +else + HAVE_SUP_IP6_TRUE='#' + HAVE_SUP_IP6_FALSE= +fi + + +# Check whether --enable-gre was given. +if test "${enable_gre+set}" = set; then : + enableval=$enable_gre; enable_gre="$enableval" +else + enable_gre="no" +fi + +if test "x$enable_gre" = "xyes"; then + CPPFLAGS="$CPPFLAGS -DGRE" +fi + +# Check whether --enable-mpls was given. +if test "${enable_mpls+set}" = set; then : + enableval=$enable_mpls; enable_mpls="$enableval" +else + enable_mpls="no" +fi + +if test "x$enable_mpls" = "xyes"; then + CPPFLAGS="$CPPFLAGS -DMPLS" +fi + +# Check whether --enable-prelude was given. +if test "${enable_prelude+set}" = set; then : + enableval=$enable_prelude; enable_prelude="$enableval" +else + enable_prelude="no" +fi + +if test "x$enable_prelude" = "xyes"; then + +# Check whether --with-libprelude-prefix was given. +if test "${with_libprelude_prefix+set}" = set; then : + withval=$with_libprelude_prefix; libprelude_config_prefix="$withval" +else + libprelude_config_prefix="" +fi + + + if test x$libprelude_config_prefix != x ; then + if test x${LIBPRELUDE_CONFIG+set} != xset ; then + LIBPRELUDE_CONFIG=$libprelude_config_prefix/bin/libprelude-config + fi + fi + + # Extract the first word of "libprelude-config", so it can be a program name with args. +set dummy libprelude-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LIBPRELUDE_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $LIBPRELUDE_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_LIBPRELUDE_CONFIG="$LIBPRELUDE_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LIBPRELUDE_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_LIBPRELUDE_CONFIG" && ac_cv_path_LIBPRELUDE_CONFIG="no" + ;; +esac +fi +LIBPRELUDE_CONFIG=$ac_cv_path_LIBPRELUDE_CONFIG +if test -n "$LIBPRELUDE_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBPRELUDE_CONFIG" >&5 +$as_echo "$LIBPRELUDE_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "$LIBPRELUDE_CONFIG" != "no"; then + if $($LIBPRELUDE_CONFIG --thread > /dev/null 2>&1); then + LIBPRELUDE_PTHREAD_CFLAGS=`$LIBPRELUDE_CONFIG --thread --cflags` + + if test x = xtrue || test x = xyes; then + libprelude_config_args="--thread" + else + libprelude_config_args="--no-thread" + fi + else + LIBPRELUDE_PTHREAD_CFLAGS=`$LIBPRELUDE_CONFIG --pthread-cflags` + fi + fi + + min_libprelude_version=0.9.6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libprelude - version >= $min_libprelude_version" >&5 +$as_echo_n "checking for libprelude - version >= $min_libprelude_version... " >&6; } + no_libprelude="" + if test "$LIBPRELUDE_CONFIG" = "no" ; then + no_libprelude=yes + else + LIBPRELUDE_CFLAGS=`$LIBPRELUDE_CONFIG $libprelude_config_args --cflags` + LIBPRELUDE_LDFLAGS=`$LIBPRELUDE_CONFIG $libprelude_config_args --ldflags` + LIBPRELUDE_LIBS=`$LIBPRELUDE_CONFIG $libprelude_config_args --libs` + LIBPRELUDE_PREFIX=`$LIBPRELUDE_CONFIG $libprelude_config_args --prefix` + LIBPRELUDE_CONFIG_PREFIX=`$LIBPRELUDE_CONFIG $libprelude_config_args --config-prefix` + libprelude_config_version=`$LIBPRELUDE_CONFIG $libprelude_config_args --version` + + + ac_save_CFLAGS="$CFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBPRELUDE_CFLAGS" + LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS" + LIBS="$LIBS $LIBPRELUDE_LIBS" + rm -f conf.libpreludetest + if test "$cross_compiling" = yes; then : + echo $ac_n "cross compiling; assumed OK... $ac_c" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include + +int +main () +{ + system ("touch conf.libpreludetest"); + + if( strcmp( prelude_check_version(NULL), "$libprelude_config_version" ) ) + { + printf("\n*** 'libprelude-config --version' returned %s, but LIBPRELUDE (%s)\n", + "$libprelude_config_version", prelude_check_version(NULL) ); + printf("*** was found! If libprelude-config was correct, then it is best\n"); + printf("*** to remove the old version of LIBPRELUDE. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If libprelude-config was wrong, set the environment variable LIBPRELUDE_CONFIG\n"); + printf("*** to point to the correct copy of libprelude-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ( strcmp(prelude_check_version(NULL), LIBPRELUDE_VERSION ) ) { + printf("\n*** LIBPRELUDE header file (version %s) does not match\n", LIBPRELUDE_VERSION); + printf("*** library (version %s)\n", prelude_check_version(NULL) ); + } + else { + if ( prelude_check_version( "$min_libprelude_version" ) ) + return 0; + else { + printf("no\n*** An old version of LIBPRELUDE (%s) was found.\n", + prelude_check_version(NULL) ); + printf("*** You need a version of LIBPRELUDE newer than %s. The latest version of\n", + "$min_libprelude_version" ); + printf("*** LIBPRELUDE is always available from http://www.prelude-ids.com/development/download/\n"); + printf("*** \n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the libprelude-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of LIBPRELUDE, but you can also set the LIBPRELUDE_CONFIG environment to point to the\n"); + printf("*** correct copy of libprelude-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + no_libprelude=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + LDFLAGS="$ac_save_LDFLAGS" + fi + + if test "x$no_libprelude" = x ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + use_prelude="yes" + else + if test -f conf.libpreludetest ; then + : + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + if test "$LIBPRELUDE_CONFIG" = "no" ; then + echo "*** The libprelude-config script installed by LIBPRELUDE could not be found" + echo "*** If LIBPRELUDE was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the LIBPRELUDE_CONFIG environment variable to the" + echo "*** full path to libprelude-config." + else + if test -f conf.libpreludetest ; then + : + else + echo "*** Could not run libprelude test program, checking why..." + CFLAGS="$CFLAGS $LIBPRELUDE_CFLAGS" + LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS" + LIBS="$LIBS $LIBPRELUDE_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include + +int +main () +{ + return !!prelude_check_version(NULL); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding LIBPRELUDE or finding the wrong" + echo "*** version of LIBPRELUDE. If it is not finding LIBPRELUDE, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" +else + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means LIBPRELUDE was incorrectly installed" + echo "*** or that you have moved LIBPRELUDE since it was installed. In the latter case, you" + echo "*** may want to edit the libprelude-config script: $LIBPRELUDE_CONFIG" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + LIBPRELUDE_CFLAGS="" + LIBPRELUDE_LDFLAGS="" + LIBPRELUDE_LIBS="" + use_prelude="no" + fi + rm -f conf.libpreludetest + + + + + + + + +$as_echo "#define PRELUDE_APPLICATION_USE_LIBTOOL2 /**/" >>confdefs.h + + + + if test "$use_prelude" = "yes"; then + LDFLAGS="${LDFLAGS} ${LIBPRELUDE_LDFLAGS}" + LIBS="$LIBS ${LIBPRELUDE_LIBS}" + CFLAGS="$CFLAGS ${LIBPRELUDE_PTHREAD_CFLAGS}" + +$as_echo "#define HAVE_LIBPRELUDE 1" >>confdefs.h + + fi +fi + +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; enable_debug="$enableval" +else + enable_debug="no" +fi + +if test "x$enable_debug" = "xyes"; then + NO_OPTIMIZE="yes" + CPPFLAGS="$CPPFLAGS -DDEBUG" + + # in case user override doesn't include -g + if echo $CFLAGS | grep -qve -g ; then + CFLAGS="$CFLAGS -g" + fi +fi + + +# Check whether --with-mysql was given. +if test "${with_mysql+set}" = set; then : + withval=$with_mysql; with_mysql="$withval" +else + with_mysql="no" +fi + + + +# Check whether --with-mysql_includes was given. +if test "${with_mysql_includes+set}" = set; then : + withval=$with_mysql_includes; with_mysql_includes="$withval"; with_mysql="yes" +else + with_mysql_includes="no" +fi + + + +# Check whether --with-mysql_libraries was given. +if test "${with_mysql_libraries+set}" = set; then : + withval=$with_mysql_libraries; with_mysql_libraries="$withval"; with_mysql="yes" +else + with_mysql_libraries="no" +fi + + +default_directory="/usr /usr/local" +if test "x$with_mysql" != "xno"; then + if test "x$with_mysql" = "xyes"; then + if test "x$with_mysql_includes" != "xno"; then + mysql_inc_directory="$with_mysql_includes"; + else + mysql_inc_directory="$default_directory"; + fi + if test "x$with_mysql_libraries" != "xno"; then + mysql_lib_directory="$with_mysql_libraries"; + else + mysql_lib_directory="$default_directory"; + fi + mysql_fail="yes" + elif test -d "$withval"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Providing a directory for the --with-mysql option" >&5 +$as_echo "$as_me: WARNING: Providing a directory for the --with-mysql option" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will be deprecated in the future in favour of" >&5 +$as_echo "$as_me: WARNING: will be deprecated in the future in favour of" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-mysql-libraries and --with-mysql-includes" >&5 +$as_echo "$as_me: WARNING: --with-mysql-libraries and --with-mysql-includes" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: options to address issues with non-standard" >&5 +$as_echo "$as_me: WARNING: options to address issues with non-standard" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: installations and 64bit platforms." >&5 +$as_echo "$as_me: WARNING: installations and 64bit platforms." >&2;} + mysql_inc_directory="$withval" + mysql_lib_directory="$withval" + mysql_fail="yes" + elif test "x$with_mysql" = "x"; then + mysql_inc_directory="$default_directory" + mysql_lib_directory="$default_directory" + mysql_fail="yes" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql" >&5 +$as_echo_n "checking for mysql... " >&6; } + + for i in $mysql_inc_directory; do + if test -r "$i/mysql.h"; then + MYSQL_INC_DIR="$i" + elif test -r "$i/include/mysql.h"; then + MYSQL_INC_DIR="$i/include" + elif test -r "$i/include/mysql/mysql.h"; then + MYSQL_INC_DIR="$i/include/mysql" + elif test -r "$i/mysql/mysql.h"; then + MYSQL_INC_DIR="$i/mysql" + elif test -r "$i/mysql/include/mysql.h"; then + MYSQL_INC_DIR="$i/mysql/include" + fi + done + + for i in $mysql_lib_directory; do + if test -z "$MYSQL_LIB_DIR"; then + str="$i/libmysqlclient.*" + for j in `echo $str`; do + if test -r $j; then + MYSQL_LIB_DIR=$i + break 2 + fi + done + fi + if test -z "$MYSQL_LIB_DIR"; then + str="$i/lib/libmysqlclient.*" + for j in `echo $str`; do + if test -r "$j"; then + MYSQL_LIB_DIR="$i/lib" + break 2 + fi + done + fi + if test -z "$MYSQL_LIB_DIR"; then + str="$i/mysql/libmysqlclient.*" + for j in `echo $str`; do + if test -r "$j"; then + MYSQL_LIB_DIR="$i/mysql" + break 2 + fi + done + fi + if test -z "$MYSQL_LIB_DIR"; then + str="$i/mysql/lib/libmysqlclient.*" + for j in `echo $str`; do + if test -r "$j"; then + MYSQL_LIB_DIR="$i/mysql/lib" + break 2 + fi + done + fi + if test -z "$MYSQL_LIB_DIR"; then + str="$i/lib/mysql/libmysqlclient.*" + for j in `echo $str`; do + if test -r "$j"; then + MYSQL_LIB_DIR="$i/lib/mysql" + break 2 + fi + done + fi + done + + if test -z "$MYSQL_INC_DIR"; then + if test "x$mysql_fail" != "xno"; then + tmp="" + for i in $mysql_inc_directory; do + tmp="$tmp $i $i/include $i/include/mysql $i/mysql $i/mysql/include" + done + + echo + echo + echo "**********************************************" + echo " ERROR: unable to find" "mysql headers (mysql.h)" + echo " checked in the following places" + for i in `echo $tmp`; do + echo " $i" + done + echo "**********************************************" + echo + exit 1 + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + else + + if test -z "$MYSQL_LIB_DIR"; then + if test "x$mysql_fail" != "xno"; then + tmp="" + for i in $mysql_lib_directory; do + tmp="$tmp $i $i/lib $i/mysql $i/mysql/lib $i/lib/mysql" + done + + echo + echo + echo "**********************************************" + echo " ERROR: unable to find" "mysqlclient library (libmysqlclient.*)" + echo " checked in the following places" + for i in `echo $tmp`; do + echo " $i" + done + echo "**********************************************" + echo + exit 1 + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LDFLAGS="${LDFLAGS} -L${MYSQL_LIB_DIR}" + CPPFLAGS="${CPPFLAGS} -I${MYSQL_INC_DIR} -DENABLE_MYSQL" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 +$as_echo_n "checking for compress in -lz... " >&6; } +if ${ac_cv_lib_z_compress+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char compress (); +int +main () +{ +return compress (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_z_compress=yes +else + ac_cv_lib_z_compress=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 +$as_echo "$ac_cv_lib_z_compress" >&6; } +if test "x$ac_cv_lib_z_compress" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZ 1 +_ACEOF + + LIBS="-lz $LIBS" + +fi + + LIBS="-lmysqlclient ${LIBS}" + fi + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql default client reconnect" >&5 +$as_echo_n "checking for mysql default client reconnect... " >&6; } + + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + if (mysql_get_client_version() < 50003) + return 1; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + mysql_default_reconnect="no" +else + mysql_default_reconnect="yes" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mysql_default_reconnect" >&5 +$as_echo "$mysql_default_reconnect" >&6; } + + if test "x$mysql_default_reconnect" = "xno"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql reconnect option" >&5 +$as_echo_n "checking for mysql reconnect option... " >&6; } + + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + if (mysql_get_client_version() < 50013) + return 1; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + mysql_has_reconnect="yes" +else + mysql_has_reconnect="no" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mysql_has_reconnect" >&5 +$as_echo "$mysql_has_reconnect" >&6; } + + if test "x$mysql_has_reconnect" = "xyes"; then + +$as_echo "#define MYSQL_HAS_OPT_RECONNECT 1" >>confdefs.h + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql setting of reconnect option before connect bug" >&5 +$as_echo_n "checking for mysql setting of reconnect option before connect bug... " >&6; } + + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + if (mysql_get_client_version() < 50019) + return 1; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + mysql_has_reconnect_bug="no" +else + mysql_has_reconnect_bug="yes" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mysql_has_reconnect_bug" >&5 +$as_echo "$mysql_has_reconnect_bug" >&6; } + + if test "x$mysql_has_reconnect_bug" = "xyes"; then + +$as_echo "#define MYSQL_HAS_OPT_RECONNECT_BUG 1" >>confdefs.h + + fi + fi + fi +fi + +# Check whether --enable-mysql-ssl-support was given. +if test "${enable_mysql_ssl_support+set}" = set; then : + enableval=$enable_mysql_ssl_support; enable_mysql_ssl_support="$enableval" +else + enable_debug="no" +fi + +if test "x$enable_mysql_ssl_support" = "xyes"; then + CPPFLAGS="$CPPFLAGS -DMYSQL_SSL_SUPPORT" + + # in case user override doesn't include -g +# if echo $CFLAGS | grep -qve -g ; then +# CFLAGS="$CFLAGS -g" +# fi +fi + + +# Check whether --with-odbc was given. +if test "${with_odbc+set}" = set; then : + withval=$with_odbc; with_odbc="$withval" +else + with_odbc="no" +fi + + +if test "x$with_odbc" != "xno"; then + if test "x$with_odbc" = "xyes"; then + odbc_directory="$default_directory" + odbc_fail="yes" + elif test -d $withval; then + odbc_directory="$withval $default_directory"; + odbc_fail="yes" + elif test "x$with_odbc" = "x"; then + odbc_directory="$default_directory" + odbc_fail="no" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking \"for odbc\"" >&5 +$as_echo_n "checking \"for odbc\"... " >&6; } + + for i in $odbc_directory; do + if test -r "$i/include/sql.h"; then + if test -r "$i/include/sqlext.h"; then + if test -r "$i/include/sqltypes.h"; then + ODBC_DIR="$i" + ODBC_INC_DIR="$i/include" + fi fi fi + done + + if test -z "$ODBC_DIR"; then + if test "x$odbc_fail" != "xno"; then + tmp="" + for i in $odbc_directory; do + tmp="$tmp $i/include" + done + + echo + echo + echo "**********************************************" + echo " ERROR: unable to find" "odbc headers (sql.h sqlext.h sqltypes.h)" + echo " checked in the following places" + for i in `echo $tmp`; do + echo " $i" + done + echo "**********************************************" + echo + exit 1 + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + else + + str="$ODBC_DIR/lib/libodbc.*" + for j in `echo $str`; do + if test -r "$j"; then + ODBC_LIB_DIR="$ODBC_DIR/lib" + ODBC_LIB="odbc" + fi + done + + + if test -z "$ODBC_LIB_DIR"; then + if test "x$odbc_fail" != "xno"; then + + echo + echo + echo "**********************************************" + echo " ERROR: unable to find" "odbc library (libodbc)" + echo " checked in the following places" + for i in `echo "$ODBC_DIR/lib"`; do + echo " $i" + done + echo "**********************************************" + echo + exit 1 + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LDFLAGS="${LDFLAGS} -L${ODBC_LIB_DIR}" + CPPFLAGS="${CPPFLAGS} -I${ODBC_INC_DIR} -DENABLE_ODBC" + LIBS="${LIBS} -l$ODBC_LIB" + fi + fi +fi + + +# Check whether --with-postgresql was given. +if test "${with_postgresql+set}" = set; then : + withval=$with_postgresql; with_postgresql="$withval" +else + with_postgresql="no" +fi + + + +# Check whether --with-pgsql_includes was given. +if test "${with_pgsql_includes+set}" = set; then : + withval=$with_pgsql_includes; with_pgsql_includes="$withval" +else + with_pgsql_includes="no" +fi + + +if test "x$with_postgresql" != "xno"; then + if test "x$with_postgresql" = "xyes"; then + postgresql_directory="$default_directory /usr/local/pgsql /usr/pgsql /usr/local" + postgresql_fail="yes" + elif test -d $withval; then + postgresql_directory="$withval $default_directory /usr/local/pgsql /usr/pgsql" + postgresql_fail="yes" + elif test "$with_postgresql" = ""; then + postgresql_directory="$default_directory /usr/local/pgsql /usr/pgsql" + postgresql_fail="no" + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for postgresql" >&5 +$as_echo_n "checking for postgresql... " >&6; } + + if test "x$with_pgsql_includes" != "xno"; then + for i in $with_pgsql_includes $postgresql_directory; do + if test -r "$i/libpq-fe.h"; then + POSTGRESQL_INC_DIR="$i" + elif test -r "$i/include/pgsql/libpq-fe.h"; then + POSTGRESQL_INC_DIR="$i/include/pgsql" + elif test -r "$i/include/libpq-fe.h"; then + POSTGRESQL_INC_DIR="$i/include" + elif test -r "$i/include/postgresql/libpq-fe.h"; then + POSTGRESQL_INC_DIR="$i/include/postgresql" + fi + done + fi + + if test -z "$POSTGRESQL_INC_DIR"; then + for i in $postgresql_directory; do + if test -r "$i/include/pgsql/libpq-fe.h"; then + POSTGRESQL_DIR="$i" + POSTGRESQL_INC_DIR="$i/include/pgsql" + elif test -r "$i/include/libpq-fe.h"; then + POSTGRESQL_DIR="$i" + POSTGRESQL_INC_DIR="$i/include" + elif test -r "$i/include/postgresql/libpq-fe.h"; then + POSTGRESQL_DIR="$i" + POSTGRESQL_INC_DIR="$i/include/postgresql" + fi + done + fi + + if test -z "$POSTGRESQL_INC_DIR"; then + if test "x$postgresql_fail" != "xno"; then + tmp="" + if test "x$with_pgsql_includes" != "xno"; then + tmp="$tmp $with_pgsql_includes" + fi + for i in $postgresql_directory; do + tmp="$tmp $i/include $i/include/pgsql" + done + + echo + echo + echo "**********************************************" + echo " ERROR: unable to find" "postgresql header file (libpq-fe.h)" + echo " checked in the following places" + for i in `echo $tmp`; do + echo " $i" + done + echo "**********************************************" + echo + exit 1 + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi + + + if test -z "$POSTGRESQL_DIR"; then + for dir in $postgresql_directory; do + for i in "lib" "lib/pgsql"; do + str="$dir/$i/libpq.*" + for j in `echo $str`; do + if test -r $j; then + POSTGRESQL_LIB_DIR="$dir/$i" + break 2 + fi + done + done + done + else + POSTGRESQL_LIB_DIR="$POSTGRESQL_DIR/lib" + fi + + if test -z "$POSTGRESQL_LIB_DIR"; then + if test "$postgresql_fail" != "no"; then + + echo + echo + echo "**********************************************" + echo " ERROR: unable to find" "postgresql library libpq" + echo " checked in the following places" + for i in `echo "$POSTGRESQL_DIR/lib $POSTGRESQL_DIR/lib/pgsql"`; do + echo " $i" + done + echo "**********************************************" + echo + exit 1 + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; }; + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LDFLAGS="${LDFLAGS} -L${POSTGRESQL_LIB_DIR}" + CPPFLAGS="${CPPFLAGS} -I${POSTGRESQL_INC_DIR} -DENABLE_POSTGRESQL" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQexec in -lpq" >&5 +$as_echo_n "checking for PQexec in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQexec+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQexec (); +int +main () +{ +return PQexec (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQexec=yes +else + ac_cv_lib_pq_PQexec=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQexec" >&5 +$as_echo "$ac_cv_lib_pq_PQexec" >&6; } +if test "x$ac_cv_lib_pq_PQexec" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPQ 1 +_ACEOF + + LIBS="-lpq $LIBS" + +else + PQLIB="no" +fi + + if test "x$PQLIB" != "xno"; then + LIBS="${LIBS} -lpq" + else + echo + echo " ERROR! libpq (postgresql) not found!" + echo + exit 1 + fi + fi + +ac_fn_c_check_func "$LINENO" "PQping" "ac_cv_func_PQping" +if test "x$ac_cv_func_PQping" = xyes; then : + +$as_echo "#define HAVE_PQPING 1" >>confdefs.h + +fi + + +fi + + +# Check whether --with-oracle was given. +if test "${with_oracle+set}" = set; then : + withval=$with_oracle; with_oracle="$withval" +else + with_oracle="no" +fi + + +if test "x$with_oracle" != "xno"; then + if test "x$with_oracle" = "xyes"; then + oracle_directory="$default_directory ${ORACLE_HOME}" + oracle_fail="yes" + elif test -d $withval; then + oracle_directory="$withval $default_directory ${ORACLE_HOME}" + oracle_fail="yes" + elif test "x$with_oracle" = "x"; then + oracle_directory="$default_directory ${ORACLE_HOME}" + oracle_fail="no" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for oracle" >&5 +$as_echo_n "checking for oracle... " >&6; } + + for i in $oracle_directory; do + if test -r "$i/rdbms/demo/oci.h"; then + ORACLE_DIR="$i" + fi + done + + if test -z "$ORACLE_DIR"; then + if test "x$oracle_fail" != "xno"; then + tmp="" + for i in $oracle_directory; do + tmp="$tmp $i/rdbms/demo" + done + + echo + echo + echo "**********************************************" + echo " ERROR: unable to find" "OCI header file (oci.h)" + echo " checked in the following places" + for i in `echo $tmp`; do + echo " $i" + done + echo "**********************************************" + echo + exit 1 + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + else + for i in "rdbms/demo" "rdbms/public" "network/public"; do + ORACLE_CPP_FLAGS="$ORACLE_CPP_FLAGS -I$ORACLE_DIR/$i" + done + ORACLE_LIB_DIR="$ORACLE_DIR/lib" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + LDFLAGS="${LDFLAGS} -L${ORACLE_LIB_DIR}" + CPPFLAGS="${CPPFLAGS} ${ORACLE_CPP_FLAGS} -DENABLE_ORACLE" + + ORACLE_LIBS="-lclntsh" + if test -r "$ORACLE_LIB_DIR/libwtc9.so"; then + ORACLE_LIBS="${ORACLE_LIBS} -lwtc9" + elif test -r "$ORACLE_LIB_DIR/libwtc8.so"; then + ORACLE_LIBS="${ORACLE_LIBS} -lwtc8" + fi + LIBS="${LIBS} ${ORACLE_LIBS}" + fi +fi + +# Check whether --enable-aruba was given. +if test "${enable_aruba+set}" = set; then : + enableval=$enable_aruba; enable_aruba="$enableval" +else + enable_aruba="no" +fi + +if test "x$enable_aruba" = "xyes"; then + CPPFLAGS="$CPPFLAGS -DARUBA" +fi + +# Check whether --enable-bro was given. +if test "${enable_bro+set}" = set; then : + enableval=$enable_bro; enable_bro="$enableval" +else + enable_bro="no" +fi + + +# Check whether --with-broccoli was given. +if test "${with_broccoli+set}" = set; then : + withval=$with_broccoli; with_broccoli="$withval" +else + with_broccoli="no" +fi + +if test "x$enable_bro" = "xyes"; then + if test -d $withval; then + broccoli_directory="$withval $default_directory"; + else + broccoli_directory="$default_directory /usr/local/bro"; + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broccoli" >&5 +$as_echo_n "checking for broccoli... " >&6; } + + for i in $broccoli_directory; do + if test -x "$i/bin/broccoli-config"; then + BROCCOLI_DIR="$i" + fi + done + + if test -z "$BROCCOLI_DIR"; then + tmp="" + for i in $broccoli_directory; do + tmp="$tmp $i/include" + done + + echo + echo + echo "**********************************************" + echo " ERROR: unable to find" "Broccoli header file (broccoli.h)" + echo " checked in the following places" + for i in `echo $tmp`; do + echo " $i" + done + echo "**********************************************" + echo + exit 1 + + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LDFLAGS="${LDFLAGS} `${BROCCOLI_DIR}/bin/broccoli-config --libs`" + CPPFLAGS="${CPPFLAGS} `${BROCCOLI_DIR}/bin/broccoli-config --cflags`" + LIBS="${LIBS} -lbroccoli" +fi + +# Checking for Tcl support (required by spo_sguil) + +# Check whether --with-tcl was given. +if test "${with_tcl+set}" = set; then : + withval=$with_tcl; with_tcl="$withval" +else + with_tcl=no +fi + + +if test "$with_tcl" != "no"; then + # prioritise manual definition of the Tcl library. + if test -d "$with_tcl"; then + tclpath="$with_tcl" + else + # let tclsh tell us where it was installed (prefer new Tcl versions). + for ac_prog in tclsh8.4 tclsh8.3 tclsh8.2 tclsh8.1 tclsh8.0 tclsh +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_TCLSH+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$TCLSH"; then + ac_cv_prog_TCLSH="$TCLSH" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_TCLSH="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +TCLSH=$ac_cv_prog_TCLSH +if test -n "$TCLSH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5 +$as_echo "$TCLSH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$TCLSH" && break +done + + if test "$TCLSH" != ""; then + tclpath=`echo 'puts [lindex $tcl_pkgPath 0]' | $TCLSH` + fi + fi + + # check, if tclConfig.sh can be found in tclsh's installation directory. + if test ! -r $tclpath/tclConfig.sh; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: + Can't find Tcl libraries. Use --with-tcl to specify + the directory containing tclConfig.sh on your system. + Continuing build without Tcl support." >&5 +$as_echo " + Can't find Tcl libraries. Use --with-tcl to specify + the directory containing tclConfig.sh on your system. + Continuing build without Tcl support." >&6; } + else + # source tclsh's configuration file and tell the user about the version. + . $tclpath/tclConfig.sh + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the tcl version number" >&5 +$as_echo_n "checking for the tcl version number... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCL_VERSION, patchlevel $TCL_PATCH_LEVEL" >&5 +$as_echo "$TCL_VERSION, patchlevel $TCL_PATCH_LEVEL" >&6; } + LIBS="$LIBS $TCL_LIBS $TCL_LIB_SPEC" + TCL_INCLUDE="$TCL_PREFIX/include/tcl$TCL_VERSION" + CPPFLAGS="$CPPFLAGS -I$TCL_INCLUDE -DENABLE_TCL"; + fi +fi + +# +# OUTPUT PLUGIN - ECHIDNA + +# Check whether --enable-plugin-echidna was given. +if test "${enable_plugin_echidna+set}" = set; then : + enableval=$enable_plugin_echidna; enable_plugin_echidna="$enableval" +else + enable_plugin_echidna="no" +fi + +if test "x$enable_plugin_echidna" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA256_Init in -lcrypto" >&5 +$as_echo_n "checking for SHA256_Init in -lcrypto... " >&6; } +if ${ac_cv_lib_crypto_SHA256_Init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypto $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SHA256_Init (); +int +main () +{ +return SHA256_Init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_SHA256_Init=yes +else + ac_cv_lib_crypto_SHA256_Init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA256_Init" >&5 +$as_echo "$ac_cv_lib_crypto_SHA256_Init" >&6; } +if test "x$ac_cv_lib_crypto_SHA256_Init" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBCRYPTO 1 +_ACEOF + + LIBS="-lcrypto $LIBS" + +else + as_fn_error $? "SHA256_Init was not found in libcrypto" "$LINENO" 5 +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_setopt in -lcurl" >&5 +$as_echo_n "checking for curl_easy_setopt in -lcurl... " >&6; } +if ${ac_cv_lib_curl_curl_easy_setopt+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcurl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char curl_easy_setopt (); +int +main () +{ +return curl_easy_setopt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_curl_curl_easy_setopt=yes +else + ac_cv_lib_curl_curl_easy_setopt=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_setopt" >&5 +$as_echo "$ac_cv_lib_curl_curl_easy_setopt" >&6; } +if test "x$ac_cv_lib_curl_curl_easy_setopt" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBCURL 1 +_ACEOF + + LIBS="-lcurl $LIBS" + +else + as_fn_error $? "curl_easy_setopt was not found in libcurl" "$LINENO" 5 +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebsocket_create_context in -lwebsockets" >&5 +$as_echo_n "checking for libwebsocket_create_context in -lwebsockets... " >&6; } +if ${ac_cv_lib_websockets_libwebsocket_create_context+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lwebsockets $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char libwebsocket_create_context (); +int +main () +{ +return libwebsocket_create_context (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_websockets_libwebsocket_create_context=yes +else + ac_cv_lib_websockets_libwebsocket_create_context=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_websockets_libwebsocket_create_context" >&5 +$as_echo "$ac_cv_lib_websockets_libwebsocket_create_context" >&6; } +if test "x$ac_cv_lib_websockets_libwebsocket_create_context" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBWEBSOCKETS 1 +_ACEOF + + LIBS="-lwebsockets $LIBS" + +else + as_fn_error $? "libwebsocket_create_context was not found in libwebsockets" "$LINENO" 5 +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_tokener_parse in -ljson" >&5 +$as_echo_n "checking for json_tokener_parse in -ljson... " >&6; } +if ${ac_cv_lib_json_json_tokener_parse+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ljson $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char json_tokener_parse (); +int +main () +{ +return json_tokener_parse (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_json_json_tokener_parse=yes +else + ac_cv_lib_json_json_tokener_parse=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_json_tokener_parse" >&5 +$as_echo "$ac_cv_lib_json_json_tokener_parse" >&6; } +if test "x$ac_cv_lib_json_json_tokener_parse" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBJSON 1 +_ACEOF + + LIBS="-ljson $LIBS" + +else + as_fn_error $? "json_tokener_parse was not found in libjson" "$LINENO" 5 +fi + + + CPPFLAGS="$CPPFLAGS -DENABLE_PLUGIN_ECHIDNA" + LIBS="$LIBS -lwebsockets -ljson -lcurl -lcrypto" +fi + + +# let's make some fixes.. + +CFLAGS=`echo $CFLAGS | sed -e 's/-I\/usr\/include //g'` +CPPFLAGS=`echo $CPPFLAGS | sed -e 's/-I\/usr\/include //g'` + +if test "x$GCC" = "xyes" ; then + echo `$CC -v 2>&1` | grep "version 4" > /dev/null + if test $? = 0 ; then + CFLAGS="$CFLAGS -fno-strict-aliasing" + fi +fi + +if test "x$linux" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linuxthreads" >&5 +$as_echo_n "checking for linuxthreads... " >&6; } + tstr=`getconf GNU_LIBPTHREAD_VERSION 2>&1` + if test $? = 0; then # GNU_LIBPTHREAD_VERSION is a valid system variable + echo $tstr | grep -i linuxthreads > /dev/null 2>&1 + if test $? = 0; then + +$as_echo "#define HAVE_LINUXTHREADS 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + else + # Use libc.so to see if linuxthreads is being used + $( ldd `which --skip-alias ls` | grep libc.so | awk '{print $3}' ) | grep -i linuxthreads > /dev/null 2>&1 + if test $? = 0; then + +$as_echo "#define HAVE_LINUXTHREADS 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi +fi + +# Set to no optimization regardless of what user or autostuff set +if test "x$NO_OPTIMIZE" = "xyes"; then + CFLAGS=`echo $CFLAGS | sed -e "s/-O./-O0/"` + + # in case user override doesn't include -O + if echo $CFLAGS | grep -qve -O0 ; then + CFLAGS="$CFLAGS -O0" + fi +fi + +if test "x$ADD_WERROR" = "xyes"; then + CFLAGS="$CFLAGS -Werror" +fi + +if test -n "$GCC"; then + CFLAGS="$CFLAGS -Wall" +fi + +echo $CFLAGS > cflags.out +echo $CPPFLAGS > cppflags.out + +INCLUDES='-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/sfutil $(extra_incl) -I$(top_srcdir)/src/output-plugins -I$(top_srcdir)/src/input-plugins' + + + + +ac_config_files="$ac_config_files Makefile src/Makefile src/sfutil/Makefile src/rbutil/Makefile src/input-plugins/Makefile src/output-plugins/Makefile etc/Makefile doc/Makefile rpm/Makefile schemas/Makefile m4/Makefile" + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +DEFS=-DHAVE_CONFIG_H + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi + +if test -z "${HAVE_SUP_IP6_TRUE}" && test -z "${HAVE_SUP_IP6_FALSE}"; then + as_fn_error $? "conditional \"HAVE_SUP_IP6\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by $as_me, which was +generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to the package provider." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +config.status +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +Copyright (C) Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' + +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in SHELL \ +ECHO \ +PATH_SEPARATOR \ +SED \ +GREP \ +EGREP \ +FGREP \ +LD \ +NM \ +LN_S \ +lt_SP2NL \ +lt_NL2SP \ +reload_flag \ +OBJDUMP \ +deplibs_check_method \ +file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ +AR \ +AR_FLAGS \ +archiver_list_spec \ +STRIP \ +RANLIB \ +CC \ +CFLAGS \ +compiler \ +lt_cv_sys_global_symbol_pipe \ +lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_c_name_address \ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +nm_file_list_spec \ +lt_prog_compiler_no_builtin_flag \ +lt_prog_compiler_pic \ +lt_prog_compiler_wl \ +lt_prog_compiler_static \ +lt_cv_prog_compiler_c_o \ +need_locks \ +MANIFEST_TOOL \ +DSYMUTIL \ +NMEDIT \ +LIPO \ +OTOOL \ +OTOOL64 \ +shrext_cmds \ +export_dynamic_flag_spec \ +whole_archive_flag_spec \ +compiler_needs_object \ +with_gnu_ld \ +allow_undefined_flag \ +no_undefined_flag \ +hardcode_libdir_flag_spec \ +hardcode_libdir_separator \ +exclude_expsyms \ +include_expsyms \ +file_list_spec \ +variables_saved_for_relink \ +libname_spec \ +library_names_spec \ +soname_spec \ +install_override_mode \ +finish_eval \ +old_striplib \ +striplib; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in reload_cmds \ +old_postinstall_cmds \ +old_postuninstall_cmds \ +old_archive_cmds \ +extract_expsyms_cmds \ +old_archive_from_new_cmds \ +old_archive_from_expsyms_cmds \ +archive_cmds \ +archive_expsym_cmds \ +module_cmds \ +module_expsym_cmds \ +export_symbols_cmds \ +prelink_cmds \ +postlink_cmds \ +postinstall_cmds \ +postuninstall_cmds \ +finish_cmds \ +sys_lib_search_path_spec \ +sys_lib_dlsearch_path_spec; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +ac_aux_dir='$ac_aux_dir' +xsi_shell='$xsi_shell' +lt_shell_append='$lt_shell_append' + +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + + + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile' + + + + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "src/sfutil/Makefile") CONFIG_FILES="$CONFIG_FILES src/sfutil/Makefile" ;; + "src/rbutil/Makefile") CONFIG_FILES="$CONFIG_FILES src/rbutil/Makefile" ;; + "src/input-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/input-plugins/Makefile" ;; + "src/output-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/output-plugins/Makefile" ;; + "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + "rpm/Makefile") CONFIG_FILES="$CONFIG_FILES rpm/Makefile" ;; + "schemas/Makefile") CONFIG_FILES="$CONFIG_FILES schemas/Makefile" ;; + "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} + ;; + "libtool":C) + + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + +# The names of the tagged configurations supported by this script. +available_tags="" + +# ### BEGIN LIBTOOL CONFIG + +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# What type of objects to build. +pic_mode=$pic_mode + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# A sed program that does not truncate output. +SED=$lt_SED + +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="\$SED -e 1s/^X//" + +# A grep program that handles long lines. +GREP=$lt_GREP + +# An ERE matcher. +EGREP=$lt_EGREP + +# A literal string matcher. +FGREP=$lt_FGREP + +# A BSD- or MS-compatible name lister. +NM=$lt_NM + +# Whether we need soft or hard links. +LN_S=$lt_LN_S + +# What is the maximum length of a command? +max_cmd_len=$max_cmd_len + +# Object file suffix (normally "o"). +objext=$ac_objext + +# Executable file suffix (normally ""). +exeext=$exeext + +# whether the shell understands "unset". +lt_unset=$lt_unset + +# turn spaces into newlines. +SP2NL=$lt_lt_SP2NL + +# turn newlines into spaces. +NL2SP=$lt_lt_NL2SP + +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method = "file_magic". +file_magic_cmd=$lt_file_magic_cmd + +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + +# The archiver. +AR=$lt_AR + +# Flags to create an archive. +AR_FLAGS=$lt_AR_FLAGS + +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + +# A symbol stripping program. +STRIP=$lt_STRIP + +# Commands used to install an old-style archive. +RANLIB=$lt_RANLIB +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + +# A C compiler. +LTCC=$lt_CC + +# LTCC compiler flags. +LTCFLAGS=$lt_CFLAGS + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration. +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair. +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# Transform the output of nm in a C name address pair when lib prefix is needed. +global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec + +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# Used to examine libraries when file_magic_cmd begins with "file". +MAGIC_CMD=$MAGIC_CMD + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + +# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +DSYMUTIL=$lt_DSYMUTIL + +# Tool to change global to local symbols on Mac OS X. +NMEDIT=$lt_NMEDIT + +# Tool to manipulate fat objects and archives on Mac OS X. +LIPO=$lt_LIPO + +# ldd/readelf like tool for Mach-O binaries on Mac OS X. +OTOOL=$lt_OTOOL + +# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +OTOOL64=$lt_OTOOL64 + +# Old archive suffix (normally "a"). +libext=$libext + +# Shared library suffix (normally ".so"). +shrext_cmds=$lt_shrext_cmds + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at link time. +variables_saved_for_relink=$lt_variables_saved_for_relink + +# Do we need the "lib" prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Library versioning type. +version_type=$version_type + +# Shared library runtime path variable. +runpath_var=$runpath_var + +# Shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + +# Command to use after installation of a shared archive. +postinstall_cmds=$lt_postinstall_cmds + +# Command to use after uninstallation of a shared archive. +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# As "finish_cmds", except a single script fragment to be evaled but +# not shown. +finish_eval=$lt_finish_eval + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Compile-time system search path for libraries. +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + + +# The linker used to build libraries. +LD=$lt_LD + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds + +# A language specific compiler. +CC=$lt_compiler + +# Is the compiler the GNU compiler? +with_gcc=$GCC + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc + +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec + +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds + +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds + +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag + +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec + +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute + +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L + +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var + +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic + +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs + +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms + +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds + +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action + +# ### END LIBTOOL CONFIG + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + +ltmain="$ac_aux_dir/ltmain.sh" + + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi + + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + + ;; + + esac +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + + +if test "x$mysql_has_reconnect" = "xno"; then +cat <&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = doc +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am INSTALL +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +depcomp = +am__depfiles_maybe = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INCLUDES = @INCLUDES@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TCLSH = @TCLSH@ +VERSION = @VERSION@ +YACC = @YACC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +extra_incl = @extra_incl@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign no-dependencies +EXTRA_DIST = INSTALL README.aruba README.database README.sguil README.snortsam +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign doc/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/etc/Makefile.in b/etc/Makefile.in new file mode 100644 index 0000000..2d17664 --- /dev/null +++ b/etc/Makefile.in @@ -0,0 +1,443 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = etc +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +depcomp = +am__depfiles_maybe = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INCLUDES = @INCLUDES@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TCLSH = @TCLSH@ +VERSION = @VERSION@ +YACC = @YACC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +extra_incl = @extra_incl@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign no-dependencies +EXTRA_DIST = barnyard2.conf +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign etc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign etc/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + + +install-data-am: + test -e $(DESTDIR)$(sysconfdir) || \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) + test -e $(DESTDIR)$(sysconfdir)/barnyard2.conf || \ + $(INSTALL_DATA) -m 600 $(top_srcdir)/etc/barnyard2.conf \ + $(DESTDIR)$(sysconfdir)/barnyard2.conf + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/m4/Makefile.in b/m4/Makefile.in new file mode 100644 index 0000000..2b67b35 --- /dev/null +++ b/m4/Makefile.in @@ -0,0 +1,440 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = m4 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +depcomp = +am__depfiles_maybe = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INCLUDES = @INCLUDES@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TCLSH = @TCLSH@ +VERSION = @VERSION@ +YACC = @YACC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +extra_incl = @extra_incl@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign no-dependencies +EXTRA_DIST = Makefile.am \ +libprelude.m4 + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign m4/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/rpm/Makefile.in b/rpm/Makefile.in new file mode 100644 index 0000000..ac3fe2a --- /dev/null +++ b/rpm/Makefile.in @@ -0,0 +1,442 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = rpm +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +depcomp = +am__depfiles_maybe = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INCLUDES = @INCLUDES@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TCLSH = @TCLSH@ +VERSION = @VERSION@ +YACC = @YACC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +extra_incl = @extra_incl@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign no-dependencies +EXTRA_DIST = Makefile.am \ +barnyard2 \ +barnyard2.spec \ +barnyard2.config + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign rpm/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign rpm/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/schemas/Makefile.in b/schemas/Makefile.in new file mode 100644 index 0000000..704c3d5 --- /dev/null +++ b/schemas/Makefile.in @@ -0,0 +1,444 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = schemas +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +depcomp = +am__depfiles_maybe = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INCLUDES = @INCLUDES@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TCLSH = @TCLSH@ +VERSION = @VERSION@ +YACC = @YACC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +extra_incl = @extra_incl@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign no-dependencies +EXTRA_DIST = Makefile.am \ +create_mssql \ +create_mysql \ +create_oracle.sql \ +create_postgresql \ +create_db2 + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign schemas/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign schemas/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/Makefile.in b/src/Makefile.in new file mode 100644 index 0000000..5316418 --- /dev/null +++ b/src/Makefile.in @@ -0,0 +1,759 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +bin_PROGRAMS = barnyard2$(EXEEXT) +subdir = src +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +PROGRAMS = $(bin_PROGRAMS) +am_barnyard2_OBJECTS = barnyard2.$(OBJEXT) debug.$(OBJEXT) \ + decode.$(OBJEXT) log.$(OBJEXT) log_text.$(OBJEXT) \ + map.$(OBJEXT) mstring.$(OBJEXT) parser.$(OBJEXT) \ + plugbase.$(OBJEXT) spooler.$(OBJEXT) strlcatu.$(OBJEXT) \ + strlcpyu.$(OBJEXT) twofish.$(OBJEXT) util.$(OBJEXT) +barnyard2_OBJECTS = $(am_barnyard2_OBJECTS) +barnyard2_DEPENDENCIES = output-plugins/libspo.a \ + input-plugins/libspi.a sfutil/libsfutil.a rbutil/librbutil.a +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = +am__depfiles_maybe = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(barnyard2_SOURCES) +DIST_SOURCES = $(barnyard2_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INCLUDES = -Isfutil +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TCLSH = @TCLSH@ +VERSION = @VERSION@ +YACC = @YACC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +extra_incl = @extra_incl@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign no-dependencies +barnyard2_SOURCES = barnyard2.c barnyard2.h \ +bounds.h \ +checksum.h \ +debug.c debug.h \ +decode.c decode.h \ +fatal.h \ +ipv6_port.h \ +generators.h \ +log.c log.h \ +log_text.c log_text.h \ +map.c map.h \ +mstring.c mstring.h \ +parser.c parser.h \ +pcap_pkthdr32.h \ +plugbase.c plugbase.h \ +rules.h \ +sf_types.h \ +spooler.c spooler.h \ +strlcatu.c strlcatu.h \ +strlcpyu.c strlcpyu.h \ +timersub.h \ +twofish.c twofish.h \ +unified2.h \ +util.c util.h + +barnyard2_LDADD = output-plugins/libspo.a \ +input-plugins/libspi.a \ +sfutil/libsfutil.a \ +rbutil/librbutil.a + +SUBDIRS = sfutil rbutil output-plugins input-plugins +all: all-recursive + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +barnyard2$(EXEEXT): $(barnyard2_OBJECTS) $(barnyard2_DEPENDENCIES) $(EXTRA_barnyard2_DEPENDENCIES) + @rm -f barnyard2$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(barnyard2_OBJECTS) $(barnyard2_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +.c.o: + $(AM_V_CC)$(COMPILE) -c -o $@ $< + +.c.obj: + $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(PROGRAMS) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: install-binPROGRAMS + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-binPROGRAMS + +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-binPROGRAMS clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/input-plugins/Makefile.in b/src/input-plugins/Makefile.in new file mode 100644 index 0000000..0e3f088 --- /dev/null +++ b/src/input-plugins/Makefile.in @@ -0,0 +1,566 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/input-plugins +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +libspi_a_AR = $(AR) $(ARFLAGS) +libspi_a_LIBADD = +am_libspi_a_OBJECTS = spi_unified2.$(OBJEXT) +libspi_a_OBJECTS = $(am_libspi_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = +am__depfiles_maybe = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libspi_a_SOURCES) +DIST_SOURCES = $(libspi_a_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INCLUDES = -I.. -I../sfutil +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TCLSH = @TCLSH@ +VERSION = @VERSION@ +YACC = @YACC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +extra_incl = @extra_incl@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign no-dependencies +noinst_LIBRARIES = libspi.a +libspi_a_SOURCES = spi_unified2.c spi_unified2.h +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/input-plugins/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/input-plugins/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +libspi.a: $(libspi_a_OBJECTS) $(libspi_a_DEPENDENCIES) $(EXTRA_libspi_a_DEPENDENCIES) + $(AM_V_at)-rm -f libspi.a + $(AM_V_AR)$(libspi_a_AR) libspi.a $(libspi_a_OBJECTS) $(libspi_a_LIBADD) + $(AM_V_at)$(RANLIB) libspi.a + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +.c.o: + $(AM_V_CC)$(COMPILE) -c -o $@ $< + +.c.obj: + $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/output-plugins/Makefile.in b/src/output-plugins/Makefile.in new file mode 100644 index 0000000..be295d3 --- /dev/null +++ b/src/output-plugins/Makefile.in @@ -0,0 +1,598 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/output-plugins +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +libspo_a_AR = $(AR) $(ARFLAGS) +libspo_a_LIBADD = +am_libspo_a_OBJECTS = spo_alert_arubaaction.$(OBJEXT) \ + spo_alert_bro.$(OBJEXT) spo_alert_cef.$(OBJEXT) \ + spo_alert_csv.$(OBJEXT) spo_alert_fast.$(OBJEXT) \ + spo_alert_full.$(OBJEXT) spo_alert_fwsam.$(OBJEXT) \ + spo_alert_json.$(OBJEXT) spo_alert_prelude.$(OBJEXT) \ + spo_alert_syslog.$(OBJEXT) spo_alert_test.$(OBJEXT) \ + spo_alert_unixsock.$(OBJEXT) spo_common.$(OBJEXT) \ + spo_log_ascii.$(OBJEXT) spo_log_null.$(OBJEXT) \ + spo_log_tcpdump.$(OBJEXT) spo_sguil.$(OBJEXT) \ + spo_echidna.$(OBJEXT) spo_syslog_full.$(OBJEXT) \ + spo_database.$(OBJEXT) spo_database_cache.$(OBJEXT) +libspo_a_OBJECTS = $(am_libspo_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = +am__depfiles_maybe = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libspo_a_SOURCES) +DIST_SOURCES = $(libspo_a_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INCLUDES = -I.. -I ../sfutil -I../rbutil +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TCLSH = @TCLSH@ +VERSION = @VERSION@ +YACC = @YACC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +extra_incl = @extra_incl@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign no-dependencies +noinst_LIBRARIES = libspo.a +libspo_a_SOURCES = \ +spo_alert_arubaaction.c spo_alert_arubaaction.h \ +spo_alert_bro.c spo_alert_bro.h \ +spo_alert_cef.c spo_alert_cef.h \ +spo_alert_csv.c spo_alert_csv.h \ +spo_alert_fast.c spo_alert_fast.h \ +spo_alert_full.c spo_alert_full.h \ +spo_alert_fwsam.c spo_alert_fwsam.h \ +spo_alert_json.c spo_alert_json.h \ +spo_alert_prelude.c spo_alert_prelude.h \ +spo_alert_syslog.c spo_alert_syslog.h \ +spo_alert_test.c spo_alert_test.h \ +spo_alert_unixsock.c spo_alert_unixsock.h \ +spo_common.c spo_common.h \ +spo_log_ascii.c spo_log_ascii.h \ +spo_log_null.c spo_log_null.h \ +spo_log_tcpdump.c spo_log_tcpdump.h \ +spo_sguil.c spo_sguil.h \ +spo_echidna.c spo_echidna.h \ +spo_syslog_full.c spo_syslog.full.h \ +spo_database.c spo_database.h \ +spo_database_cache.c spo_database_cache.h + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/output-plugins/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/output-plugins/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +libspo.a: $(libspo_a_OBJECTS) $(libspo_a_DEPENDENCIES) $(EXTRA_libspo_a_DEPENDENCIES) + $(AM_V_at)-rm -f libspo.a + $(AM_V_AR)$(libspo_a_AR) libspo.a $(libspo_a_OBJECTS) $(libspo_a_LIBADD) + $(AM_V_at)$(RANLIB) libspo.a + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +.c.o: + $(AM_V_CC)$(COMPILE) -c -o $@ $< + +.c.obj: + $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/sfutil/Makefile.in b/src/sfutil/Makefile.in new file mode 100644 index 0000000..77d3857 --- /dev/null +++ b/src/sfutil/Makefile.in @@ -0,0 +1,580 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/sfutil +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +libsfutil_a_AR = $(AR) $(ARFLAGS) +libsfutil_a_LIBADD = +am_libsfutil_a_OBJECTS = getopt_long.$(OBJEXT) sfmemcap.$(OBJEXT) \ + sfprimetable.$(OBJEXT) sfxhash.$(OBJEXT) sf_ip.$(OBJEXT) \ + sf_iph.$(OBJEXT) sf_ipvar.$(OBJEXT) sf_textlog.$(OBJEXT) \ + sf_vartable.$(OBJEXT) +libsfutil_a_OBJECTS = $(am_libsfutil_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = +am__depfiles_maybe = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libsfutil_a_SOURCES) +DIST_SOURCES = $(libsfutil_a_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INCLUDES = -I.. +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TCLSH = @TCLSH@ +VERSION = @VERSION@ +YACC = @YACC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +extra_incl = @extra_incl@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign no-dependencies +noinst_LIBRARIES = libsfutil.a +libsfutil_a_SOURCES = bitop.h \ + getopt_long.c getopt.h getopt1.h \ + sfhashfcn.h \ + sfmemcap.c sfmemcap.h \ + sfprimetable.c sfprimetable.h \ + sfxhash.c sfxhash.h \ + sf_ip.c sf_ip.h \ + sf_iph.c sf_iph.h \ + sf_ipvar.c sf_ipvar.h \ + sf_textlog.c sf_textlog.h \ + sf_vartable.c sf_vartable.h + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/sfutil/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/sfutil/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +libsfutil.a: $(libsfutil_a_OBJECTS) $(libsfutil_a_DEPENDENCIES) $(EXTRA_libsfutil_a_DEPENDENCIES) + $(AM_V_at)-rm -f libsfutil.a + $(AM_V_AR)$(libsfutil_a_AR) libsfutil.a $(libsfutil_a_OBJECTS) $(libsfutil_a_LIBADD) + $(AM_V_at)$(RANLIB) libsfutil.a + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +.c.o: + $(AM_V_CC)$(COMPILE) -c -o $@ $< + +.c.obj: + $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: From ab605f7dcce29a55ee8b204858cc848c99a597ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 1 Feb 2016 13:36:24 +0000 Subject: [PATCH 168/198] Updated configure.in to use new librb-http library --- configure | 8 ++++---- configure.in | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 3fc495e..75037bf 100755 --- a/configure +++ b/configure @@ -13550,12 +13550,12 @@ fi if test "x$enable_rbhttp" = "x$enableval"; then - for ac_header in librbhttp/librb-http.h + for ac_header in librbhttp/rb_http_handler.h do : - ac_fn_c_check_header_mongrel "$LINENO" "librbhttp/librb-http.h" "ac_cv_header_librbhttp_librb_http_h" "$ac_includes_default" -if test "x$ac_cv_header_librbhttp_librb_http_h" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "librbhttp/rb_http_handler.h" "ac_cv_header_librbhttp_rb_http_handler_h" "$ac_includes_default" +if test "x$ac_cv_header_librbhttp_rb_http_handler_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRBHTTP_LIBRB_HTTP_H 1 +#define HAVE_LIBRBHTTP_RB_HTTP_HANDLER_H 1 _ACEOF else diff --git a/configure.in b/configure.in index eac5d72..a5199ee 100644 --- a/configure.in +++ b/configure.in @@ -252,7 +252,7 @@ AC_ARG_ENABLE(rb-http, enable_rbhttp="$enableval", enable_rbhttp="no") if test "x$enable_rbhttp" = "x$enableval"; then - AC_CHECK_HEADERS([librbhttp/librb-http.h],[], + AC_CHECK_HEADERS([librbhttp/rb_http_handler.h],[], [ echo "Error: redBorder HTTP headers not found." exit 1 From ad18a9dfd854abde2bbc1fe0bac08381f1329873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 1 Feb 2016 14:03:08 +0000 Subject: [PATCH 169/198] Updating src/rbutil/Makefile.in, deleting rb_kafka.* references --- src/rbutil/Makefile.in | 232 ++++++++++++++++++++++++++++++----------- 1 file changed, 169 insertions(+), 63 deletions(-) diff --git a/src/rbutil/Makefile.in b/src/rbutil/Makefile.in index acf2685..291d6e8 100644 --- a/src/rbutil/Makefile.in +++ b/src/rbutil/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/rbutil -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -49,30 +93,82 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = librbutil_a_AR = $(AR) $(ARFLAGS) librbutil_a_LIBADD = -am_librbutil_a_OBJECTS = rb_kafka.$(OBJEXT) \ +am_librbutil_a_OBJECTS = rb_printbuf.$(OBJEXT) \ rb_numstrpair_list.$(OBJEXT) rb_unified2.$(OBJEXT) librbutil_a_OBJECTS = $(am_librbutil_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(librbutil_a_SOURCES) DIST_SOURCES = $(librbutil_a_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -86,6 +182,7 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -119,6 +216,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -131,6 +229,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ @@ -145,6 +244,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -178,7 +278,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -234,10 +333,11 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -librbutil.a: $(librbutil_a_OBJECTS) $(librbutil_a_DEPENDENCIES) - -rm -f librbutil.a - $(librbutil_a_AR) librbutil.a $(librbutil_a_OBJECTS) $(librbutil_a_LIBADD) - $(RANLIB) librbutil.a + +librbutil.a: $(librbutil_a_OBJECTS) $(librbutil_a_DEPENDENCIES) $(EXTRA_librbutil_a_DEPENDENCIES) + $(AM_V_at)-rm -f librbutil.a + $(AM_V_AR)$(librbutil_a_AR) librbutil.a $(librbutil_a_OBJECTS) $(librbutil_a_LIBADD) + $(AM_V_at)$(RANLIB) librbutil.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -246,13 +346,13 @@ distclean-compile: -rm -f *.tab.c .c.o: - $(COMPILE) -c $< + $(AM_V_CC)$(COMPILE) -c -o $@ $< .c.obj: - $(COMPILE) -c `$(CYGPATH_W) '$<'` + $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: - $(LTCOMPILE) -c -o $@ $< + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -260,26 +360,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -291,15 +380,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -308,6 +393,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -356,10 +456,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -442,18 +547,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. From 0b1f4242bd816e16304ed972de8955d2814d9323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Fern=C3=A1ndez=20Barrera?= Date: Mon, 1 Feb 2016 15:53:35 +0100 Subject: [PATCH 170/198] Removed whitespaces --- src/output-plugins/spo_alert_json.c | 52 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 72f90e1..1c9738c 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -371,7 +371,7 @@ static void AlertJSONInit(char *args) #ifdef HAVE_LIBRDKAFKA /* Extracted from Magnus Edenhill's kafkacat */ -static rd_kafka_conf_res_t +static rd_kafka_conf_res_t rdkafka_add_attr_to_config(rd_kafka_conf_t *rk_conf,rd_kafka_topic_conf_t *topic_conf, const char *name,const char *val,char *errstr,size_t errstr_size){ if (!strcmp(name, "list") || @@ -396,7 +396,7 @@ rdkafka_add_attr_to_config(rd_kafka_conf_t *rk_conf,rd_kafka_topic_conf_t *topic return res; } -static rd_kafka_conf_res_t +static rd_kafka_conf_res_t rdkafka_add_str_to_config(rd_kafka_conf_t *rk_conf, rd_kafka_topic_conf_t *rkt_conf, const char *_keyval, char *errstr,size_t errstr_size){ @@ -634,7 +634,7 @@ static AlertJSONData *AlertJSONParseArgs(char *args) /* DFEFAULT VALUES */ if ( !data->jsonargs ) data->jsonargs = SnortStrdup(DEFAULT_JSON); if ( !filename ) filename = ProcessFileOption(barnyard2_conf_for_parsing, DEFAULT_FILE); - + /* names-str assoc */ if(hostsListPath) FillHostsList(hostsListPath,&data->hosts,HOSTS); if(networksPath) FillHostsList(networksPath,&data->nets,NETWORKS); @@ -750,8 +750,8 @@ static AlertJSONData *AlertJSONParseArgs(char *args) data->kafka.topic = SnortStrdup(at_char+1); /* - * In DaemonMode(), kafka must start in another function, because, in daemon mode, Barnyard2Main will execute this - * function, will do a fork() and then, in the child process, will call RealAlertJSON, that will not be able to + * In DaemonMode(), kafka must start in another function, because, in daemon mode, Barnyard2Main will execute this + * function, will do a fork() and then, in the child process, will call RealAlertJSON, that will not be able to * send kafka data */ free(kafka_str); @@ -781,7 +781,7 @@ static void KafkaMsgDelivered (rd_kafka_t *rk, void *opaque, void *msg_opaque) { RefcntPrintbuf *rprintbuf = msg_opaque; - + DEBUG_WRAP(if(RPRINTBUF_MAGIC!=rprintbuf->magic) FatalError("msg_delivered: Not valid magic")); @@ -822,7 +822,7 @@ static void AlertJsonKafkaDelayedInit (AlertJSONData *this) if(NULL==this->kafka.rk) FatalError("Failed to create new producer: %s\n",errstr); - if (rd_kafka_brokers_add(this->kafka.rk, this->kafka.brokers) == 0) + if (rd_kafka_brokers_add(this->kafka.rk, this->kafka.brokers) == 0) FatalError("Kafka: No valid brokers specified in %s\n",this->kafka.brokers); this->kafka.rkt = rd_kafka_topic_new(this->kafka.rk, this->kafka.topic, this->kafka.rkt_conf); @@ -885,12 +885,12 @@ void *HttpPollFuncion(void *vjsonData) { return NULL; } -static void HTTPHandlerSetLongOpt(struct rb_http_handler_s *handler, +static void HTTPHandlerSetLongOpt(struct rb_http_handler_s *handler, const char *key,long val) { char errstr[BUFSIZ]; char valbuf[BUFSIZ]; - + snprintf(valbuf,sizeof(valbuf),"%ld",val); const int rc = rb_http_handler_set_opt(handler,key,valbuf,errstr, @@ -914,18 +914,18 @@ static void AlertJsonHTTPDelayedInit (AlertJSONData *this) __FUNCTION__); } - this->http.handler = rb_http_handler_create (this->http.url, + this->http.handler = rb_http_handler_create (this->http.url, errstr, sizeof(errstr)); - HTTPHandlerSetLongOpt(this->http.handler, "HTTP_MAX_TOTAL_CONNECTIONS", + HTTPHandlerSetLongOpt(this->http.handler, "HTTP_MAX_TOTAL_CONNECTIONS", this->http.max_connections); - HTTPHandlerSetLongOpt(this->http.handler, "HTTP_TIMEOUT", + HTTPHandlerSetLongOpt(this->http.handler, "HTTP_TIMEOUT", this->http.req_timeout); - HTTPHandlerSetLongOpt(this->http.handler, "HTTP_CONNTTIMEOUT", + HTTPHandlerSetLongOpt(this->http.handler, "HTTP_CONNTTIMEOUT", this->http.conn_timeout); - HTTPHandlerSetLongOpt(this->http.handler, "HTTP_VERBOSE", + HTTPHandlerSetLongOpt(this->http.handler, "HTTP_VERBOSE", this->http.verbose); - HTTPHandlerSetLongOpt(this->http.handler, "RB_HTTP_MAX_MESSAGES", + HTTPHandlerSetLongOpt(this->http.handler, "RB_HTTP_MAX_MESSAGES", this->http.max_queued_messages); @@ -1041,14 +1041,14 @@ static void AlertJSON(Packet *p, void *event, uint32_t event_type, void *arg) * Function: C++ version 0.4 char* style "itoa", Written by Lukás Chmela. (Modified) * * Purpose: Fast itoa conversion. snprintf is slow. - * + * * Arguments: value => Number. * result => Where to save result * base => Number base. * * Return: result * TODO: Return writed buffer lenght. - * + * */ char* _itoa(uint64_t value, char* result, int base, size_t bufsize) { // check that the base if valid @@ -1156,7 +1156,7 @@ static int extract_ip0(sfip_t *ip,const void *_event, uint32_t event_type, Packe case UNIFIED2_PACKET: // Does not have information in the event -> trying to get it from the packet return extract_ip_from_packet(ip,p,srcdst_req); - + case UNIFIED2_IDS_EVENT: case UNIFIED2_IDS_EVENT_VLAN: @@ -1171,7 +1171,7 @@ static int extract_ip0(sfip_t *ip,const void *_event, uint32_t event_type, Packe { ipv4 = ((Unified2IDSEvent *)_event)->ip_destination; } - + const int rc = sfip_set_raw(ip,&ipv4,AF_INET); if(p && rc != SFIP_SUCCESS) return extract_ip_from_packet(ip,p,srcdst_req); @@ -1449,7 +1449,7 @@ static char *extract_AS(AlertJSONData *jsonData,const sfip_t *ip) #endif #ifdef RB_EXTRADATA -static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, +static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, struct printbuf *printbuf, Unified2ExtraData *U2ExtraData) { uint32_t event_info; /* type in Unified2 Event */ @@ -1573,7 +1573,7 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, return 0; } -static int printElementExtraData(void *event, uint32_t event_type, +static int printElementExtraData(void *event, uint32_t event_type, AlertJSONTemplateElement *templateElement, struct printbuf *printbuf) { uint32_t event_data_type; /* datatype in Unified2 Event*/ @@ -1632,7 +1632,7 @@ static int printElementExtraData(void *event, uint32_t event_type, * Returns: 0 if nothing writed to jsonData. !=0 otherwise. * */ -static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, +static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, AlertJSONData *jsonData, AlertJSONTemplateElement *templateElement, struct printbuf *printbuf) { @@ -1710,7 +1710,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, if(event != NULL){ const int priority_id = ntohl(((Unified2EventCommon *)event)->priority_id); const char *prio_name = NULL; - if(priority_id < sizeof(priority_name)/sizeof(priority_name[0])) + if(priority_id < sizeof(priority_name)/sizeof(priority_name[0])) prio_name = priority_name[priority_id]; printbuf_memappend_fast_str(printbuf,prio_name ? prio_name : templateElement->defaultValue); } @@ -1933,7 +1933,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case SRCPORT_NAME: case DSTPORT_NAME: { - const uint16_t port = templateElement->id==SRCPORT_NAME? + const uint16_t port = templateElement->id==SRCPORT_NAME? extract_src_port(event, event_type, p) :extract_dst_port(event, event_type, p); Number_str_assoc * service_name_asoc = SearchNumberStr(port,jsonData->services); @@ -1951,7 +1951,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, case SRCPORT: case DSTPORT: { - const uint16_t port = templateElement->id==SRCPORT? + const uint16_t port = templateElement->id==SRCPORT? extract_src_port(event, event_type, p) :extract_dst_port(event, event_type, p); @@ -2083,7 +2083,7 @@ static int printElementWithTemplate(Packet *p, void *event, uint32_t event_type, printbuf_memappend_fast_str(printbuf,itoa10(GET_IPH_TTL(p),buf,bufLen)); break; - case TOS: + case TOS: if(p && IPH_IS_VALID(p)) printbuf_memappend_fast_str(printbuf,itoa10(GET_IPH_TOS(p),buf,bufLen)); break; From eb3f943233e91603f13d8abd7fbaf284d7b426ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Fern=C3=A1ndez=20Barrera?= Date: Mon, 1 Feb 2016 16:01:13 +0100 Subject: [PATCH 171/198] Integrated new version of librbhttp --- src/output-plugins/spo_alert_json.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 1c9738c..3e9d0f8 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -76,7 +76,7 @@ #endif #ifdef HAVE_LIBRBHTTP -#include +#include #define MAX_HTTP_DEFAULT_CONECTIONS 10 #define MAX_HTTP_DEFAULT_QUEUED_MESSAGES 10000 #endif @@ -917,17 +917,20 @@ static void AlertJsonHTTPDelayedInit (AlertJSONData *this) this->http.handler = rb_http_handler_create (this->http.url, errstr, sizeof(errstr)); - HTTPHandlerSetLongOpt(this->http.handler, "HTTP_MAX_TOTAL_CONNECTIONS", - this->http.max_connections); + HTTPHandlerSetLongOpt(this->http.handler, "RB_HTTP_CONNECTIONS", + this->http.max_connections); HTTPHandlerSetLongOpt(this->http.handler, "HTTP_TIMEOUT", - this->http.req_timeout); + this->http.req_timeout); HTTPHandlerSetLongOpt(this->http.handler, "HTTP_CONNTTIMEOUT", - this->http.conn_timeout); + this->http.conn_timeout); HTTPHandlerSetLongOpt(this->http.handler, "HTTP_VERBOSE", - this->http.verbose); + this->http.verbose); HTTPHandlerSetLongOpt(this->http.handler, "RB_HTTP_MAX_MESSAGES", - this->http.max_queued_messages); + this->http.max_queued_messages); + HTTPHandlerSetLongOpt(this->http.handler, "RB_HTTP_MODE", + 1); + rb_http_handler_run(this->http.handler); if(NULL==this->http.handler) { From 8a6997b5fc3fe09053c13bd391022bd3bb99f048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 1 Feb 2016 15:58:09 +0000 Subject: [PATCH 172/198] Added many autoconf.sh generated files --- .gitignore | 9 - aclocal.m4 | 1220 ++++++ config.guess | 1568 ++++++++ config.h.in | 326 ++ config.sub | 1793 +++++++++ install-sh | 527 +++ ltmain.sh | 9655 +++++++++++++++++++++++++++++++++++++++++++++ m4/libtool.m4 | 7982 +++++++++++++++++++++++++++++++++++++ m4/ltoptions.m4 | 384 ++ m4/ltsugar.m4 | 123 + m4/ltversion.m4 | 23 + m4/lt~obsolete.m4 | 98 + missing | 215 + 13 files changed, 23914 insertions(+), 9 deletions(-) create mode 100644 aclocal.m4 create mode 100755 config.guess create mode 100644 config.h.in create mode 100755 config.sub create mode 100755 install-sh create mode 100644 ltmain.sh create mode 100644 m4/libtool.m4 create mode 100644 m4/ltoptions.m4 create mode 100644 m4/ltsugar.m4 create mode 100644 m4/ltversion.m4 create mode 100644 m4/lt~obsolete.m4 create mode 100755 missing diff --git a/.gitignore b/.gitignore index 2ce9174..9b31786 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,11 @@ *~ *.o -aclocal.m4 autom4te.cache/ cflags.out /config.* cppflags.out -install-sh libtool -ltmain.sh -m4/libtool.m4 -m4/lt~obsolete.m4 -m4/ltoptions.m4 -m4/ltsugar.m4 -m4/ltversion.m4 Makefile -missing src/barnyard2 src/input-plugins/libspi.a src/output-plugins/libspo.a diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 0000000..bdebcb2 --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,1220 @@ +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.14' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.14.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.14.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# -*- Autoconf -*- +# Obsolete and "removed" macros, that must however still report explicit +# error messages when used, to smooth transition. +# +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +AC_DEFUN([AM_CONFIG_HEADER], +[AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl +AC_CONFIG_HEADERS($@)]) + +AC_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should simply use the 'AC][_PROG_CC' macro instead. +Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', +but upon 'ac_cv_prog_cc_stdc'.])]) + +AC_DEFUN([AM_C_PROTOTYPES], + [AC_FATAL([automatic de-ANSI-fication support has been removed])]) +AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([m4/libprelude.m4]) +m4_include([m4/libtool.m4]) +m4_include([m4/ltoptions.m4]) +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) diff --git a/config.guess b/config.guess new file mode 100755 index 0000000..9afd676 --- /dev/null +++ b/config.guess @@ -0,0 +1,1568 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-11-29' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) 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, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner. +# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright 1992-2013 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; +esac + +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/config.h.in b/config.h.in new file mode 100644 index 0000000..a4c46a3 --- /dev/null +++ b/config.h.in @@ -0,0 +1,326 @@ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + +/* Define if AIX */ +#undef AIX + +/* Define if broken SIOCGIFMTU */ +#undef BROKEN_SIOCGIFMTU + +/* Define if BSDi */ +#undef BSDI + +/* Define if CYGWIN */ +#undef CYGWIN + +/* Define if errlist is predefined */ +#undef ERRLIST_PREDEFINED + +/* Define if FreeBSD */ +#undef FREEBSD + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Have MaxMind GeoIP */ +#undef HAVE_GEOIP + +/* Define to 1 if you have the header file. */ +#undef HAVE_GEOIP_H + +/* Define to 1 if the system has the type `int16_t'. */ +#undef HAVE_INT16_T + +/* Define to 1 if the system has the type `int32_t'. */ +#undef HAVE_INT32_T + +/* Define to 1 if the system has the type `int64_t'. */ +#undef HAVE_INT64_T + +/* Define to 1 if the system has the type `int8_t'. */ +#undef HAVE_INT8_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `crypto' library (-lcrypto). */ +#undef HAVE_LIBCRYPTO + +/* Define to 1 if you have the `curl' library (-lcurl). */ +#undef HAVE_LIBCURL + +/* Define to 1 if you have the `GeoIP' library (-lGeoIP). */ +#undef HAVE_LIBGEOIP + +/* Define to 1 if you have the `json' library (-ljson). */ +#undef HAVE_LIBJSON + +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM + +/* Define to 1 if you have the `nsl' library (-lnsl). */ +#undef HAVE_LIBNSL + +/* Define to 1 if you have the `pcap' library (-lpcap). */ +#undef HAVE_LIBPCAP + +/* Define to 1 if you have the `pfring' library (-lpfring). */ +#undef HAVE_LIBPFRING + +/* Define to 1 if you have the `pq' library (-lpq). */ +#undef HAVE_LIBPQ + +/* Define whether Prelude support is enabled */ +#undef HAVE_LIBPRELUDE + +/* Define to 1 if you have the `rbhttp' library (-lrbhttp). */ +#undef HAVE_LIBRBHTTP + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBRBHTTP_RB_HTTP_HANDLER_H + +/* Define to 1 if you have the `rb_mac_vendors' library (-lrb_mac_vendors). */ +#undef HAVE_LIBRB_MAC_VENDORS + +/* Define to 1 if you have the `rd' library (-lrd). */ +#undef HAVE_LIBRD + +/* Define to 1 if you have the `rdkafka' library (-lrdkafka). */ +#undef HAVE_LIBRDKAFKA + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBRDKAFKA_RDKAFKA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBRD_RD_H + +/* Define to 1 if you have the `socket' library (-lsocket). */ +#undef HAVE_LIBSOCKET + +/* Define to 1 if you have the `websockets' library (-lwebsockets). */ +#undef HAVE_LIBWEBSOCKETS + +/* Define to 1 if you have the `wpcap' library (-lwpcap). */ +#undef HAVE_LIBWPCAP + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + +/* Define whether linuxthreads is being used */ +#undef HAVE_LINUXTHREADS + +/* Define to 1 if you have the header file. */ +#undef HAVE_MATH_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_PATHS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_PCAP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_PFRING_H + +/* Define if PQping exists. */ +#undef HAVE_PQPING + +/* Have redborder mac vendors library */ +#undef HAVE_RB_MAC_VENDORS + +/* Define to 1 if you have the header file. */ +#undef HAVE_RB_MAC_VENDORS_H + +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT + +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + +/* Define to 1 if you have the `strtoul' function. */ +#undef HAVE_STRTOUL + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKIO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if the system has the type `uint16_t'. */ +#undef HAVE_UINT16_T + +/* Define to 1 if the system has the type `uint32_t'. */ +#undef HAVE_UINT32_T + +/* Define to 1 if the system has the type `uint64_t'. */ +#undef HAVE_UINT64_T + +/* Define to 1 if the system has the type `uint8_t'. */ +#undef HAVE_UINT8_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if the system has the type `u_int16_t'. */ +#undef HAVE_U_INT16_T + +/* Define to 1 if the system has the type `u_int32_t'. */ +#undef HAVE_U_INT32_T + +/* Define to 1 if the system has the type `u_int64_t'. */ +#undef HAVE_U_INT64_T + +/* Define to 1 if the system has the type `u_int8_t'. */ +#undef HAVE_U_INT8_T + +/* Define to 1 if you have the `vsnprintf' function. */ +#undef HAVE_VSNPRINTF + +/* Define to 1 if you have the `vswprintf' function. */ +#undef HAVE_VSWPRINTF + +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + +/* Define to 1 if you have the `wprintf' function. */ +#undef HAVE_WPRINTF + +/* Define if the compiler understands __FUNCTION__. */ +#undef HAVE___FUNCTION__ + +/* Define if the compiler understands __func__. */ +#undef HAVE___func__ + +/* Define if HP-UX 10 or 11 */ +#undef HPUX + +/* For INADDR_NONE definition */ +#undef INADDR_NONE + +/* Define if Irix 6 */ +#undef IRIX + +/* Define if Linux */ +#undef LINUX + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + +/* Define if MacOS */ +#undef MACOS + +/* For MySQL versions 5.0.13 and greater */ +#undef MYSQL_HAS_OPT_RECONNECT + +/* For MySQL versions 5.0.13 to 5.0.18 */ +#undef MYSQL_HAS_OPT_RECONNECT_BUG + +/* Define if OpenBSD < 2.3 */ +#undef OPENBSD + +/* Define if Tru64 */ +#undef OSF1 + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define if pcap timeout is ignored */ +#undef PCAP_TIMEOUT_IGNORED + +/* Define whether application use libtool >= 2.0 */ +#undef PRELUDE_APPLICATION_USE_LIBTOOL2 + +/* ExtraData collection */ +#undef RB_EXTRADATA + +/* The size of `char', as computed by sizeof. */ +#undef SIZEOF_CHAR + +/* The size of `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of `long int', as computed by sizeof. */ +#undef SIZEOF_LONG_INT + +/* The size of `long long int', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG_INT + +/* The size of `short', as computed by sizeof. */ +#undef SIZEOF_SHORT + +/* The size of `unsigned int', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_INT + +/* The size of `unsigned long int', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_LONG_INT + +/* The size of `unsigned long long int', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_LONG_LONG_INT + +/* Define if Solaris */ +#undef SOLARIS + +/* For sparc v9 with %time register */ +#undef SPARCV9 + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define if SunOS */ +#undef SUNOS + +/* Version number of package */ +#undef VERSION + +/* Define if words are big endian */ +#undef WORDS_BIGENDIAN + +/* Define if words must align */ +#undef WORDS_MUSTALIGN + +/* Define __FUNCTION__ as required. */ +#undef __FUNCTION__ diff --git a/config.sub b/config.sub new file mode 100755 index 0000000..61cb4bc --- /dev/null +++ b/config.sub @@ -0,0 +1,1793 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-10-01' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) 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, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + + +# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright 1992-2013 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 \ + | or1k | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or1k-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/install-sh b/install-sh new file mode 100755 index 0000000..377bb86 --- /dev/null +++ b/install-sh @@ -0,0 +1,527 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2011-11-20.07; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# 'make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +nl=' +' +IFS=" "" $nl" + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +no_target_directory= + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names problematic for 'test' and other utilities. + case $src in + -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + dst=$dst_arg + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + + eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir + shift + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/ltmain.sh b/ltmain.sh new file mode 100644 index 0000000..63ae69d --- /dev/null +++ b/ltmain.sh @@ -0,0 +1,9655 @@ + +# libtool (GNU libtool) 2.4.2 +# Written by Gordon Matzigkeit , 1996 + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, +# or obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# Usage: $progname [OPTION]... [MODE-ARG]... +# +# Provide generalized library-building support services. +# +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) +# --no-warn don't display warning messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages +# --version print version information +# -h, --help, --help-all print short, long, or detailed help message +# +# MODE must be one of the following: +# +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory +# +# MODE-ARGS vary depending on the MODE. When passed as first option, +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. +# Try `$progname --help --mode=MODE' for a more detailed description of MODE. +# +# When reporting a bug, please describe a test case to reproduce it and +# include the following information: +# +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.4.2 +# automake: $automake_version +# autoconf: $autoconf_version +# +# Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . + +PROGRAM=libtool +PACKAGE=libtool +VERSION=2.4.2 +TIMESTAMP="" +package_revision=1.3337 + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# NLS nuisances: We save the old values to restore during execute mode. +lt_user_locale= +lt_safe_locale= +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var + $lt_var=C + export $lt_var + lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" + lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + fi" +done +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL + +$lt_unset CDPATH + + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + + + +: ${CP="cp -f"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${MAKE="make"} +: ${MKDIR="mkdir"} +: ${MV="mv -f"} +: ${RM="rm -f"} +: ${SHELL="${CONFIG_SHELL-/bin/sh}"} +: ${Xsed="$SED -e 1s/^X//"} + +# Global variables: +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. + +exit_status=$EXIT_SUCCESS + +# Make sure IFS has a sensible default +lt_nl=' +' +IFS=" $lt_nl" + +dirname="s,/[^/]*$,," +basename="s,^.*/,," + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation + + +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' + +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi + + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} + +# The name of this program: +func_dirname_and_basename "$progpath" +progname=$func_basename_result + +# Make sure we have an absolute path for reexecution: +case $progpath in + [\\/]*|[A-Za-z]:\\*) ;; + *[\\/]*) + progdir=$func_dirname_result + progdir=`cd "$progdir" && pwd` + progpath="$progdir/$progname" + ;; + *) + save_IFS="$IFS" + IFS=${PATH_SEPARATOR-:} + for progdir in $PATH; do + IFS="$save_IFS" + test -x "$progdir/$progname" && break + done + IFS="$save_IFS" + test -n "$progdir" || progdir=`pwd` + progpath="$progdir/$progname" + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed="${SED}"' -e 1s/^X//' +sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' + +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + +# Re-`\' parameter expansions in output of double_quote_subst that were +# `\'-ed in input to the same. If an odd number of `\' preceded a '$' +# in input to double_quote_subst, that '$' was protected from expansion. +# Since each input `\' is now two `\'s, look for any number of runs of +# four `\'s followed by two `\'s and then a '$'. `\' that '$'. +bs='\\' +bs2='\\\\' +bs4='\\\\\\\\' +dollar='\$' +sed_double_backslash="\ + s/$bs4/&\\ +/g + s/^$bs2$dollar/$bs&/ + s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g + s/\n//g" + +# Standard options: +opt_dry_run=false +opt_help=false +opt_quiet=false +opt_verbose=false +opt_warning=: + +# func_echo arg... +# Echo program name prefixed message, along with the current mode +# name if it has been set yet. +func_echo () +{ + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" +} + +# func_verbose arg... +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $opt_verbose && func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +# func_error arg... +# Echo program name prefixed message to standard error. +func_error () +{ + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 +} + +# func_warning arg... +# Echo program name prefixed warning message to standard error. +func_warning () +{ + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + + # bash bug again: + : +} + +# func_fatal_error arg... +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + func_error ${1+"$@"} + exit $EXIT_FAILURE +} + +# func_fatal_help arg... +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () +{ + func_error ${1+"$@"} + func_fatal_error "$help" +} +help="Try \`$progname --help' for more information." ## default + + +# func_grep expression filename +# Check whether EXPRESSION matches any line of FILENAME, without output. +func_grep () +{ + $GREP "$1" "$2" >/dev/null 2>&1 +} + + +# func_mkdir_p directory-path +# Make sure the entire path to DIRECTORY-PATH is available. +func_mkdir_p () +{ + my_directory_path="$1" + my_dir_list= + + if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + + # Protect directory names starting with `-' + case $my_directory_path in + -*) my_directory_path="./$my_directory_path" ;; + esac + + # While some portion of DIR does not yet exist... + while test ! -d "$my_directory_path"; do + # ...make a list in topmost first order. Use a colon delimited + # list incase some portion of path contains whitespace. + my_dir_list="$my_directory_path:$my_dir_list" + + # If the last portion added has no slash in it, the list is done + case $my_directory_path in */*) ;; *) break ;; esac + + # ...otherwise throw away the child directory and loop + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + done + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + + save_mkdir_p_IFS="$IFS"; IFS=':' + for my_dir in $my_dir_list; do + IFS="$save_mkdir_p_IFS" + # mkdir can fail with a `File exist' error if two processes + # try to create one of the directories concurrently. Don't + # stop in that case! + $MKDIR "$my_dir" 2>/dev/null || : + done + IFS="$save_mkdir_p_IFS" + + # Bail out if we (or some other process) failed to create a directory. + test -d "$my_directory_path" || \ + func_fatal_error "Failed to create \`$1'" + fi +} + + +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$opt_dry_run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || \ + func_fatal_error "cannot create temporary directory \`$my_tmpdir'" + fi + + $ECHO "$my_tmpdir" +} + + +# func_quote_for_eval arg +# Aesthetically quote ARG to be evaled later. +# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT +# is double-quoted, suitable for a subsequent eval, whereas +# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters +# which are still active within double quotes backslashified. +func_quote_for_eval () +{ + case $1 in + *[\\\`\"\$]*) + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; + *) + func_quote_for_eval_unquoted_result="$1" ;; + esac + + case $func_quote_for_eval_unquoted_result in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and and variable + # expansion for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" + ;; + *) + func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" + esac +} + + +# func_quote_for_expand arg +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + case $1 in + *[\\\`\"]*) + my_arg=`$ECHO "$1" | $SED \ + -e "$double_quote_subst" -e "$sed_double_backslash"` ;; + *) + my_arg="$1" ;; + esac + + case $my_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + my_arg="\"$my_arg\"" + ;; + esac + + func_quote_for_expand_result="$my_arg" +} + + +# func_show_eval cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$my_cmd" + my_status=$? + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi + fi +} + + +# func_show_eval_locale cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$lt_user_locale + $my_cmd" + my_status=$? + eval "$lt_safe_locale" + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi + fi +} + +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_version +# Echo version message to standard output and exit. +func_version () +{ + $opt_debug + + $SED -n '/(C)/!b go + :more + /\./!{ + N + s/\n# / / + b more + } + :go + /^# '$PROGRAM' (GNU /,/# warranty; / { + s/^# // + s/^# *$// + s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ + p + }' < "$progpath" + exit $? +} + +# func_usage +# Echo short help message to standard output and exit. +func_usage () +{ + $opt_debug + + $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ + p + }' < "$progpath" + echo + $ECHO "run \`$progname --help | more' for full usage" + exit $? +} + +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. +func_help () +{ + $opt_debug + + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* + s*\$host*'"$host"'* + s*\$SHELL*'"$SHELL"'* + s*\$LTCC*'"$LTCC"'* + s*\$LTCFLAGS*'"$LTCFLAGS"'* + s*\$LD*'"$LD"'* + s/\$with_gnu_ld/'"$with_gnu_ld"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ + p + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret + fi +} + +# func_missing_arg argname +# Echo program name prefixed message to standard error and set global +# exit_cmd. +func_missing_arg () +{ + $opt_debug + + func_error "missing argument for $1." + exit_cmd=exit +} + + +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation + + +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation + +exit_cmd=: + + + + + +magic="%%%MAGIC variable%%%" +magic_exe="%%%MAGIC EXE variable%%%" + +# Global variables. +nonopt= +preserve_args= +lo2o="s/\\.lo\$/.${objext}/" +o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "${1}=\$${1}\${2}" +} # func_append may be replaced by extended shell implementation + +# func_append_quoted var value +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +func_append_quoted () +{ + func_quote_for_eval "${2}" + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" +} # func_append_quoted may be replaced by extended shell implementation + + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "${@}"` +} # func_arith may be replaced by extended shell implementation + + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + +# func_fatal_configuration arg... +# Echo program name prefixed message to standard error, followed by +# a configuration failure hint, and exit. +func_fatal_configuration () +{ + func_error ${1+"$@"} + func_error "See the $PACKAGE documentation for more information." + func_fatal_error "Fatal configuration error." +} + + +# func_config +# Display the configuration for all the tags in this script. +func_config () +{ + re_begincf='^# ### BEGIN LIBTOOL' + re_endcf='^# ### END LIBTOOL' + + # Default configuration. + $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" + + # Now print the configurations for the tags. + for tagname in $taglist; do + $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" + done + + exit $? +} + +# func_features +# Display the features supported by this script. +func_features () +{ + echo "host: $host" + if test "$build_libtool_libs" = yes; then + echo "enable shared libraries" + else + echo "disable shared libraries" + fi + if test "$build_old_libs" = yes; then + echo "enable static libraries" + else + echo "disable static libraries" + fi + + exit $? +} + +# func_enable_tag tagname +# Verify that TAGNAME is valid, and either flag an error and exit, or +# enable the TAGNAME tag. We also add TAGNAME to the global $taglist +# variable here. +func_enable_tag () +{ + # Global variable: + tagname="$1" + + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf="/$re_begincf/,/$re_endcf/p" + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac + + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; + *) + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" + + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac +} + +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac + + + +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_warning=: +opt_verbose=: +opt_silent=false +opt_verbose=false + + +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ + # this just eases exit handling + while test $# -gt 0; do + opt="$1" + shift + case $opt in + --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" + $opt_debug + ;; + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" + shift + ;; + --preserve-dup-deps) + opt_preserve_dup_deps=: + ;; + --features) + opt_features=: +func_features + ;; + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) + opt_silent=false +func_append preserve_args " $opt" + ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; + --no-verbose) + opt_verbose=false +func_append preserve_args " $opt" + ;; + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" + shift + ;; + + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; + + # Separate optargs to long options: + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done + + # Validate options: + + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi + + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + + $opt_help || { + # Sanity checks first: + func_check_version_match + + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" + fi + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } + + + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} + + + + +## ----------- ## +## Main. ## +## ----------- ## + +# func_lalib_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_lalib_p () +{ + test -f "$1" && + $SED -e 4q "$1" 2>/dev/null \ + | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + +# func_lalib_unsafe_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function implements the same check as func_lalib_p without +# resorting to external programs. To this end, it redirects stdin and +# closes it afterwards, without saving the original file descriptor. +# As a safety measure, use it only where a negative result would be +# fatal anyway. Works if `file' does not exist. +func_lalib_unsafe_p () +{ + lalib_p=no + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then + for lalib_p_l in 1 2 3 4 + do + read lalib_p_line + case "$lalib_p_line" in + \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; + esac + done + exec 0<&5 5<&- + fi + test "$lalib_p" = yes +} + +# func_ltwrapper_script_p file +# True iff FILE is a libtool wrapper script +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_script_p () +{ + func_lalib_p "$1" +} + +# func_ltwrapper_executable_p file +# True iff FILE is a libtool wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_executable_p () +{ + func_ltwrapper_exec_suffix= + case $1 in + *.exe) ;; + *) func_ltwrapper_exec_suffix=.exe ;; + esac + $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 +} + +# func_ltwrapper_scriptname file +# Assumes file is an ltwrapper_executable +# uses $file to determine the appropriate filename for a +# temporary ltwrapper_script. +func_ltwrapper_scriptname () +{ + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +} + +# func_ltwrapper_p file +# True iff FILE is a libtool wrapper script or wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_p () +{ + func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" +} + + +# func_execute_cmds commands fail_cmd +# Execute tilde-delimited COMMANDS. +# If FAIL_CMD is given, eval that upon failure. +# FAIL_CMD may read-access the current command in variable CMD! +func_execute_cmds () +{ + $opt_debug + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs + eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +} + + +# func_source file +# Source FILE, adding directory component if necessary. +# Note that it is not necessary on cygwin/mingw to append a dot to +# FILE even if both FILE and FILE.exe exist: automatic-append-.exe +# behavior happens only for exec(3), not for open(2)! Also, sourcing +# `FILE.' does not work on cygwin managed mounts. +func_source () +{ + $opt_debug + case $1 in + */* | *\\*) . "$1" ;; + *) . "./$1" ;; + esac +} + + +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () +{ + $opt_debug + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case "$@ " in + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + func_echo "unable to infer tagged configuration" + func_fatal_error "specify a tag with \`--tag'" +# else +# func_verbose "using $tagname tagged configuration" + fi + ;; + esac + fi +} + + + +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# but don't create it if we're doing a dry run. +func_write_libtool_object () +{ + write_libobj=${1} + if test "$build_libtool_libs" = yes; then + write_lobj=\'${2}\' + else + write_lobj=none + fi + + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T </dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " \`$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result="$func_convert_core_msys_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 + + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_nix_to_cygwin + + +# func_mode_compile arg... +func_mode_compile () +{ + $opt_debug + # Get the compilation command and the source file. + base_compile= + srcfile="$nonopt" # always keep a non-empty value in "srcfile" + suppress_opt=yes + suppress_output= + arg_mode=normal + libobj= + later= + pie_flag= + + for arg + do + case $arg_mode in + arg ) + # do not "continue". Instead, add this to base_compile + lastarg="$arg" + arg_mode=normal + ;; + + target ) + libobj="$arg" + arg_mode=normal + continue + ;; + + normal ) + # Accept any command-line options. + case $arg in + -o) + test -n "$libobj" && \ + func_fatal_error "you cannot specify \`-o' more than once" + arg_mode=target + continue + ;; + + -pie | -fpie | -fPIE) + func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) + func_append later " $arg" + continue + ;; + + -no-suppress) + suppress_opt=no + continue + ;; + + -Xcompiler) + arg_mode=arg # the next one goes into the "base_compile" arg list + continue # The current "srcfile" will either be retained or + ;; # replaced later. I would guess that would be a bug. + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + lastarg= + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" + func_append_quoted lastarg "$arg" + done + IFS="$save_ifs" + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. + func_append base_compile " $lastarg" + continue + ;; + + *) + # Accept the current argument as the source file. + # The previous "srcfile" becomes the current argument. + # + lastarg="$srcfile" + srcfile="$arg" + ;; + esac # case $arg + ;; + esac # case $arg_mode + + # Aesthetically quote the previous argument. + func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in + arg) + func_fatal_error "you must specify an argument for -Xcompile" + ;; + target) + func_fatal_error "you must specify a target with \`-o'" + ;; + *) + # Get the name of the library object. + test -z "$libobj" && { + func_basename "$srcfile" + libobj="$func_basename_result" + } + ;; + esac + + # Recognize several different file suffixes. + # If the user specifies -o file.o, it is replaced with file.lo + case $libobj in + *.[cCFSifmso] | \ + *.ada | *.adb | *.ads | *.asm | \ + *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) + func_xform "$libobj" + libobj=$func_xform_result + ;; + esac + + case $libobj in + *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; + *) + func_fatal_error "cannot determine name of library object from \`$libobj'" + ;; + esac + + func_infer_tag $base_compile + + for arg in $later; do + case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + continue + ;; + + -static) + build_libtool_libs=no + build_old_libs=yes + continue + ;; + + -prefer-pic) + pic_mode=yes + continue + ;; + + -prefer-non-pic) + pic_mode=no + continue + ;; + esac + done + + func_quote_for_eval "$libobj" + test "X$libobj" != "X$func_quote_for_eval_result" \ + && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && func_warning "libobj name \`$libobj' may not contain shell special characters." + func_dirname_and_basename "$obj" "/" "" + objname="$func_basename_result" + xdir="$func_dirname_result" + lobj=${xdir}$objdir/$objname + + test -z "$base_compile" && \ + func_fatal_help "you must specify a compilation command" + + # Delete any leftover library objects. + if test "$build_old_libs" = yes; then + removelist="$obj $lobj $libobj ${libobj}T" + else + removelist="$lobj $libobj ${libobj}T" + fi + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in + cygwin* | mingw* | pw32* | os2* | cegcc*) + pic_mode=default + ;; + esac + if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + # non-PIC code in shared libraries is not supported + pic_mode=default + fi + + # Calculate the filename of the output object if compiler does + # not support -o with -c + if test "$compiler_c_o" = no; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} + lockfile="$output_obj.lock" + else + output_obj= + need_locks=no + lockfile= + fi + + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test "$need_locks" = yes; then + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + elif test "$need_locks" = warn; then + if test -f "$lockfile"; then + $ECHO "\ +*** ERROR, $lockfile exists and contains: +`cat $lockfile 2>/dev/null` + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist + func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + + # Only build a PIC object if we are building libtool libraries. + if test "$build_libtool_libs" = yes; then + # Without this assignment, base_compile gets emptied. + fbsd_hideous_sh_bug=$base_compile + + if test "$pic_mode" != no; then + command="$base_compile $qsrcfile $pic_flag" + else + # Don't build PIC code + command="$base_compile $qsrcfile" + fi + + func_mkdir_p "$xdir$objdir" + + if test -z "$output_obj"; then + # Place PIC objects in $objdir + func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ + 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' + + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed, then go on to compile the next one + if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then + func_show_eval '$MV "$output_obj" "$lobj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + + # Allow error messages only from the first compilation. + if test "$suppress_opt" = yes; then + suppress_output=' >/dev/null 2>&1' + fi + fi + + # Only build a position-dependent object if we build old libraries. + if test "$build_old_libs" = yes; then + if test "$pic_mode" != yes; then + # Don't build PIC code + command="$base_compile $qsrcfile$pie_flag" + else + command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then + func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. + func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed + if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then + func_show_eval '$MV "$output_obj" "$obj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + fi + + $opt_dry_run || { + func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" + + # Unlock the critical section if it was locked + if test "$need_locks" != no; then + removelist=$lockfile + $RM "$lockfile" + fi + } + + exit $EXIT_SUCCESS +} + +$opt_help || { + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} +} + +func_mode_help () +{ + # We need to display help for each of the modes. + case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. + func_help + ;; + + clean) + $ECHO \ +"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... + +Remove files from the build directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. + +If FILE is a libtool library, object or program, all the files associated +with it are deleted. Otherwise, only FILE itself is deleted using RM." + ;; + + compile) + $ECHO \ +"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE + +Compile a source file into a libtool library object. + +This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler + +COMPILE-COMMAND is a command to be used in creating a \`standard' object file +from the given SOURCEFILE. + +The output file name is determined by removing the directory component from +SOURCEFILE, then substituting the C source code suffix \`.c' with the +library object suffix, \`.lo'." + ;; + + execute) + $ECHO \ +"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... + +Automatically set library path, then run a program. + +This mode accepts the following additional options: + + -dlopen FILE add the directory containing FILE to the library path + +This mode sets the library path environment variable according to \`-dlopen' +flags. + +If any of the ARGS are libtool executable wrappers, then they are translated +into their corresponding uninstalled binary, and any of their required library +directories are added to the library path. + +Then, COMMAND is executed, with ARGS as arguments." + ;; + + finish) + $ECHO \ +"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... + +Complete the installation of libtool libraries. + +Each LIBDIR is a directory that contains libtool libraries. + +The commands that this mode executes may require superuser privileges. Use +the \`--dry-run' option if you just want to see what would be executed." + ;; + + install) + $ECHO \ +"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... + +Install executables or libraries. + +INSTALL-COMMAND is the installation command. The first component should be +either the \`install' or \`cp' program. + +The following components of INSTALL-COMMAND are treated specially: + + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation + +The rest of the components are interpreted as arguments to that command (only +BSD-compatible install options are recognized)." + ;; + + link) + $ECHO \ +"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... + +Link object files or libraries together to form another library, or to +create an executable program. + +LINK-COMMAND is a command using the C compiler that you would use to create +a program from several object files. + +The following components of LINK-COMMAND are treated specially: + + -all-static do not do any dynamic linking at all + -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) + -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE + try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX + try to export only the symbols matching REGEX + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened + -no-fast-install disable the fast-install mode + -no-install link a not-installable executable + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects + -precious-files-regex REGEX + don't remove output files matching REGEX + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -shared only do dynamic linking of libtool libraries + -shrext SUFFIX override the standard shared library file extension + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] + specify library version info [each variable defaults to 0] + -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) + +All other options (arguments beginning with \`-') are ignored. + +Every other argument is treated as a filename. Files ending in \`.la' are +treated as uninstalled libtool libraries, other files are standard or library +object files. + +If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +only library objects (\`.lo' files) may be specified, and \`-rpath' is +required, except when creating a convenience library. + +If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +using \`ar' and \`ranlib', or on Windows using \`lib'. + +If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +is created, otherwise an executable program is created." + ;; + + uninstall) + $ECHO \ +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... + +Remove libraries from an installation directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. + +If FILE is a libtool library, all the files associated with it are deleted. +Otherwise, only FILE itself is deleted using RM." + ;; + + *) + func_fatal_help "invalid operation mode \`$opt_mode'" + ;; + esac + + echo + $ECHO "Try \`$progname --help' for more information about other modes." +} + +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test "$opt_help" = :; then + func_mode_help + else + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + sed '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi + + +# func_mode_execute arg... +func_mode_execute () +{ + $opt_debug + # The first argument is the command name. + cmd="$nonopt" + test -z "$cmd" && \ + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. + for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" + + dir= + case $file in + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" + + # Read the libtool library. + dlname= + library_names= + func_source "$file" + + # Skip this library if it cannot be dlopened. + if test -z "$dlname"; then + # Warn if it was a shared library. + test -n "$library_names" && \ + func_warning "\`$file' was not linked with \`-export-dynamic'" + continue + fi + + func_dirname "$file" "" "." + dir="$func_dirname_result" + + if test -f "$dir/$objdir/$dlname"; then + func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + fi + fi + ;; + + *.lo) + # Just add the directory containing the .lo file. + func_dirname "$file" "" "." + dir="$func_dirname_result" + ;; + + *) + func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + continue + ;; + esac + + # Get the absolute pathname. + absdir=`cd "$dir" && pwd` + test -n "$absdir" && dir="$absdir" + + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then + eval "$shlibpath_var=\"\$dir\"" + else + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. + libtool_execute_magic="$magic" + + # Check if any of the arguments is a wrapper script. + args= + for file + do + case $file in + -* | *.la | *.lo ) ;; + *) + # Do a test to see if this is really a libtool program. + if func_ltwrapper_script_p "$file"; then + func_source "$file" + # Transform arg to wrapped name. + file="$progdir/$program" + elif func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + func_source "$func_ltwrapper_scriptname_result" + # Transform arg to wrapped name. + file="$progdir/$program" + fi + ;; + esac + # Quote arguments (to preserve shell metacharacters). + func_append_quoted args "$file" + done + + if test "X$opt_dry_run" = Xfalse; then + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" + fi + + # Restore saved environment variables + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + else + $lt_unset $lt_var + fi" + done + + # Now prepare to actually exec the command. + exec_cmd="\$cmd$args" + else + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + fi +} + +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} + + +# func_mode_finish arg... +func_mode_finish () +{ + $opt_debug + libs= + libdirs= + admincmds= + + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument \`$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. + func_execute_cmds "$finish_cmds" 'admincmds="$admincmds +'"$cmd"'"' + fi + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" + $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done + fi + + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo + + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi + exit $EXIT_SUCCESS +} + +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} + + +# func_mode_install arg... +func_mode_install () +{ + $opt_debug + # There may be an optional sh(1) argument at the beginning of + # install_prog (especially on Windows NT). + if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + # Allow the use of GNU shtool's install command. + case $nonopt in *shtool*) :;; *) false;; esac; then + # Aesthetically quote it. + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " + arg=$1 + shift + else + install_prog= + arg=$nonopt + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" + func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac + + # We need to accept at least all the BSD install flags. + dest= + files= + opts= + prev= + install_type= + isdir=no + stripme= + no_mode=: + for arg + do + arg2= + if test -n "$dest"; then + func_append files " $dest" + dest=$arg + continue + fi + + case $arg in + -d) isdir=yes ;; + -f) + if $install_cp; then :; else + prev=$arg + fi + ;; + -g | -m | -o) + prev=$arg + ;; + -s) + stripme=" -s" + continue + ;; + -*) + ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi + prev= + else + dest=$arg + continue + fi + ;; + esac + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" + func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ + func_fatal_help "you must specify an install program" + + test -n "$prev" && \ + func_fatal_help "the \`$prev' option requires an argument" + + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + + if test -z "$files"; then + if test -z "$dest"; then + func_fatal_help "no file or destination specified" + else + func_fatal_help "you must specify a destination" + fi + fi + + # Strip any trailing slash from the destination. + func_stripname '' '/' "$dest" + dest=$func_stripname_result + + # Check to see that the destination is a directory. + test -d "$dest" && isdir=yes + if test "$isdir" = yes; then + destdir="$dest" + destname= + else + func_dirname_and_basename "$dest" "" "." + destdir="$func_dirname_result" + destname="$func_basename_result" + + # Not a directory, so check to see that there is only one file specified. + set dummy $files; shift + test "$#" -gt 1 && \ + func_fatal_help "\`$dest' is not a directory" + fi + case $destdir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + for file in $files; do + case $file in + *.lo) ;; + *) + func_fatal_help "\`$destdir' must be an absolute directory name" + ;; + esac + done + ;; + esac + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" + + staticlibs= + future_libdirs= + current_libdirs= + for file in $files; do + + # Do each installation. + case $file in + *.$libext) + # Do the static libraries later. + func_append staticlibs " $file" + ;; + + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" + + library_names= + old_library= + relink_command= + func_source "$file" + + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir="$func_dirname_result" + func_append dir "$objdir" + + if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. + test "$inst_prefix_dir" = "$destdir" && \ + func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + fi + + func_warning "relinking \`$file'" + func_show_eval "$relink_command" \ + 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + fi + + # See the names of the shared library. + set dummy $library_names; shift + if test -n "$1"; then + realname="$1" + shift + + srcname="$realname" + test -n "$relink_command" && srcname="$realname"T + + # Install the shared library and build the symlinks. + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ + 'exit $?' + tstripme="$stripme" + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme="" + ;; + esac + ;; + esac + if test -n "$tstripme" && test -n "$striplib"; then + func_show_eval "$striplib $destdir/$realname" 'exit $?' + fi + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. + # Try `ln -sf' first, because the `ln' binary might depend on + # the symlink we replace! Solaris /bin/ln does not understand -f, + # so we also need to try rm && ln -s. + for linkname + do + test "$linkname" != "$realname" \ + && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" + done + fi + + # Do each command in the postinstall commands. + lib="$destdir/$realname" + func_execute_cmds "$postinstall_cmds" 'exit $?' + fi + + # Install the pseudo-library for information purposes. + func_basename "$file" + name="$func_basename_result" + instname="$dir/$name"i + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. + test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) + # Install (i.e. copy) a libtool object. + + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" + fi + + # Deduce the name of the destination old-style object file. + case $destfile in + *.lo) + func_lo2o "$destfile" + staticdest=$func_lo2o_result + ;; + *.$objext) + staticdest="$destfile" + destfile= + ;; + *) + func_fatal_help "cannot copy a libtool object to \`$destfile'" + ;; + esac + + # Install the libtool object if requested. + test -n "$destfile" && \ + func_show_eval "$install_prog $file $destfile" 'exit $?' + + # Install the old object if enabled. + if test "$build_old_libs" = yes; then + # Deduce the name of the old-style object file. + func_lo2o "$file" + staticobj=$func_lo2o_result + func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' + fi + exit $EXIT_SUCCESS + ;; + + *) + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" + fi + + # If the file is missing, and there is a .exe on the end, strip it + # because it is most likely a libtool script we actually want to + # install + stripped_ext="" + case $file in + *.exe) + if test ! -f "$file"; then + func_stripname '' '.exe' "$file" + file=$func_stripname_result + stripped_ext=".exe" + fi + ;; + esac + + # Do a test to see if this is really a libtool program. + case $host in + *cygwin* | *mingw*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result + else + func_stripname '' '.exe' "$file" + wrapper=$func_stripname_result + fi + ;; + *) + wrapper=$file + ;; + esac + if func_ltwrapper_script_p "$wrapper"; then + notinst_deplibs= + relink_command= + + func_source "$wrapper" + + # Check the variables that should have been set. + test -z "$generated_by_libtool_version" && \ + func_fatal_error "invalid libtool wrapper script \`$wrapper'" + + finalize=yes + for lib in $notinst_deplibs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + func_source "$lib" + fi + libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + if test -n "$libdir" && test ! -f "$libfile"; then + func_warning "\`$lib' has not been installed in \`$libdir'" + finalize=no + fi + done + + relink_command= + func_source "$wrapper" + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + $opt_dry_run || { + if test "$finalize" = yes; then + tmpdir=`func_mktempdir` + func_basename "$file$stripped_ext" + file="$func_basename_result" + outputname="$tmpdir/$file" + # Replace the output file specification. + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + + $opt_silent || { + func_quote_for_expand "$relink_command" + eval "func_echo $func_quote_for_expand_result" + } + if eval "$relink_command"; then : + else + func_error "error: relink \`$file' with the above command before installing it" + $opt_dry_run || ${RM}r "$tmpdir" + continue + fi + file="$outputname" + else + func_warning "cannot relink \`$file'" + fi + } + else + # Install the binary that we compiled earlier. + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` + fi + fi + + # remove .exe since cygwin /usr/bin/install will append another + # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in + *.exe:*.exe) + # this is ok + ;; + *.exe:*) + destfile=$destfile.exe + ;; + *:*.exe) + func_stripname '' '.exe' "$destfile" + destfile=$func_stripname_result + ;; + esac + ;; + esac + func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' + $opt_dry_run || if test -n "$outputname"; then + ${RM}r "$tmpdir" + fi + ;; + esac + done + + for file in $staticlibs; do + func_basename "$file" + name="$func_basename_result" + + # Set up the ranlib parameters. + oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result + + func_show_eval "$install_prog \$file \$oldlib" 'exit $?' + + if test -n "$stripme" && test -n "$old_striplib"; then + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' + fi + + # Do each command in the postinstall commands. + func_execute_cmds "$old_postinstall_cmds" 'exit $?' + done + + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" + + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + else + exit $EXIT_SUCCESS + fi +} + +test "$opt_mode" = install && func_mode_install ${1+"$@"} + + +# func_generate_dlsyms outputname originator pic_p +# Extract symbols from dlprefiles and create ${outputname}S.o with +# a dlpreopen symbol table. +func_generate_dlsyms () +{ + $opt_debug + my_outputname="$1" + my_originator="$2" + my_pic_p="${3-no}" + my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + my_dlsyms= + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then + my_dlsyms="${my_outputname}S.c" + else + func_error "not configured to extract global symbols from dlpreopened files" + fi + fi + + if test -n "$my_dlsyms"; then + case $my_dlsyms in + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. + nlist="$output_objdir/${my_outputname}.nm" + + func_show_eval "$RM $nlist ${nlist}S ${nlist}T" + + # Parse the name list into a source file. + func_verbose "creating $output_objdir/$my_dlsyms" + + $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ +/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ + +#ifdef __cplusplus +extern \"C\" { +#endif + +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + +/* External symbol declarations for the compiler. */\ +" + + if test "$dlself" = yes; then + func_verbose "generating symbol list for \`$output'" + + $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" + + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } + fi + fi + + for dlprefile in $dlprefiles; do + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac + done + + $opt_dry_run || { + # Make sure we have at least an empty file. + test -f "$nlist" || : > "$nlist" + + if test -n "$exclude_expsyms"; then + $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $MV "$nlist"T "$nlist" + fi + + # Try sorting and uniquifying the output. + if $GREP -v "^: " < "$nlist" | + if sort -k 3 /dev/null 2>&1; then + sort -k 3 + else + sort +2 + fi | + uniq > "$nlist"S; then + : + else + $GREP -v "^: " < "$nlist" > "$nlist"S + fi + + if test -f "$nlist"S; then + eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' + else + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" + fi + + echo >> "$output_objdir/$my_dlsyms" "\ + +/* The mapping between symbol names and symbols. */ +typedef struct { + const char *name; + void *address; +} lt_dlsymlist; +extern LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[]; +LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[] = +{\ + { \"$my_originator\", (void *) 0 }," + + case $need_lib_prefix in + no) + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + *) + eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + esac + echo >> "$output_objdir/$my_dlsyms" "\ + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt_${my_prefix}_LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif\ +" + } # !$opt_dry_run + + pic_flag_for_symtable= + case "$compile_command " in + *" -static "*) ;; + *) + case $host in + # compiling the symbol table file with pic_flag works around + # a FreeBSD bug that causes programs to crash when -lm is + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; + *-*-hpux*) + pic_flag_for_symtable=" $pic_flag" ;; + *) + if test "X$my_pic_p" != Xno; then + pic_flag_for_symtable=" $pic_flag" + fi + ;; + esac + ;; + esac + symtab_cflags= + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; + *) func_append symtab_cflags " $arg" ;; + esac + done + + # Now compile the dynamic symbol file. + func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' + + # Clean up the generated files. + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + + # Transform the symbol file into the correct name. + symfileobj="$output_objdir/${my_outputname}S.$objext" + case $host in + *cygwin* | *mingw* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + else + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + fi + ;; + *) + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + ;; + esac + ;; + *) + func_fatal_error "unknown suffix for \`$my_dlsyms'" + ;; + esac + else + # We keep going just in case the user didn't refer to + # lt_preloaded_symbols. The linker will fail if global_symbol_pipe + # really was required. + + # Nullify the symbol file. + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` + fi +} + +# func_win32_libid arg +# return the library type of file 'arg' +# +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. +func_win32_libid () +{ + $opt_debug + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ + s,.*,import, + p + q + } + }'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac + fi + ;; + *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... + case $win32_fileres in + *MS\ Windows\ PE\ Intel*) + win32_libid_type="x86 DLL" + ;; + esac + ;; + esac + $ECHO "$win32_libid_type" +} + +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} + + +# func_extract_an_archive dir oldlib +func_extract_an_archive () +{ + $opt_debug + f_ex_an_ar_dir="$1"; shift + f_ex_an_ar_oldlib="$1" + if test "$lock_old_archive_extraction" = yes; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then + $opt_dry_run || rm -f "$lockfile" + fi + if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then + : + else + func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" + fi +} + + +# func_extract_archives gentop oldlib ... +func_extract_archives () +{ + $opt_debug + my_gentop="$1"; shift + my_oldlibs=${1+"$@"} + my_oldobjs="" + my_xlib="" + my_xabs="" + my_xdir="" + + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in + [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + func_basename "$my_xlib" + my_xlib="$func_basename_result" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + func_arith $extracted_serial + 1 + extracted_serial=$func_arith_result + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" + + func_mkdir_p "$my_xdir" + + case $host in + *-darwin*) + func_verbose "Extracting $my_xabs" + # Do not bother doing anything if just a dry run + $opt_dry_run || { + darwin_orig_dir=`pwd` + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` + darwin_base_archive=`basename "$darwin_archive"` + darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` + if test -n "$darwin_arches"; then + darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" + for darwin_arch in $darwin_arches ; do + func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" + $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" + cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" + func_extract_an_archive "`pwd`" "${darwin_base_archive}" + cd "$darwin_curdir" + $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + done # $darwin_arches + ## Okay now we've a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ + cd "$darwin_orig_dir" + else + cd $darwin_orig_dir + func_extract_an_archive "$my_xdir" "$my_xabs" + fi # $darwin_arches + } # !$opt_dry_run + ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + + func_extract_archives_result="$my_oldobjs" +} + + +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=${1-no} + + $ECHO "\ +#! $SHELL + +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='$sed_quote_subst' + +# Be Bourne compatible +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command=\"$relink_command\" + +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variables: + generated_by_libtool_version='$macro_version' + notinst_deplibs='$notinst_deplibs' +else + # When we are sourced in execute mode, \$file and \$ECHO are already set. + if test \"\$libtool_execute_magic\" != \"$magic\"; then + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ which is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options which match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` + test \"x\$thisdir\" = \"x\$file\" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` + while test -n \"\$file\"; do + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` + + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; + esac + fi + + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + done + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then + # special case for '.' + if test \"\$thisdir\" = \".\"; then + thisdir=\`pwd\` + fi + # remove .libs from thisdir + case \"\$thisdir\" in + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; + $objdir ) thisdir=. ;; + esac + fi + + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" +" + + if test "$fast_install" = yes; then + $ECHO "\ + program=lt-'$outputname'$exeext + progdir=\"\$thisdir/$objdir\" + + if test ! -f \"\$progdir/\$program\" || + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then + + file=\"\$\$-\$program\" + + if test ! -d \"\$progdir\"; then + $MKDIR \"\$progdir\" + else + $RM \"\$progdir/\$file\" + fi" + + $ECHO "\ + + # relink executable if necessary + if test -n \"\$relink_command\"; then + if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" + exit 1 + fi + fi + + $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $RM \"\$progdir/\$program\"; + $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $RM \"\$progdir/\$file\" + fi" + else + $ECHO "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" + fi + + $ECHO "\ + + if test -f \"\$progdir/\$program\"; then" + + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` + + export $shlibpath_var +" + fi + + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. + func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. + \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 + fi +fi\ +" +} + + +# func_emit_cwrapperexe_src +# emit the source code for a wrapper executable on stdout +# Must ONLY be called from within func_mode_link because +# it depends on a number of variable set therein. +func_emit_cwrapperexe_src () +{ + cat < +#include +#ifdef _MSC_VER +# include +# include +# include +#else +# include +# include +# ifdef __CYGWIN__ +# include +# endif +#endif +#include +#include +#include +#include +#include +#include +#include +#include + +/* declarations of non-ANSI functions */ +#if defined(__MINGW32__) +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined(__CYGWIN__) +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined (other platforms) ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined(_MSC_VER) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined(__CYGWIN__) +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined (other platforms) ... */ +#endif + +#if defined(PATH_MAX) +# define LT_PATHMAX PATH_MAX +#elif defined(MAXPATHLEN) +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif + +#ifndef S_IXOTH +# define S_IXOTH 0 +#endif +#ifndef S_IXGRP +# define S_IXGRP 0 +#endif + +/* path handling portability macros */ +#ifndef DIR_SEPARATOR +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' +#endif + +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +# define HAVE_DOS_BASED_FILE_SYSTEM +# define FOPEN_WB "wb" +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif +#endif + +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ + +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + +#ifndef FOPEN_WB +# define FOPEN_WB "w" +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif + +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ +} while (0) + +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; +#else +static int lt_debug = 0; +#endif + +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ + +void *xmalloc (size_t num); +char *xstrdup (const char *string); +const char *base_name (const char *name); +char *find_executable (const char *wrapper); +char *chase_symlinks (const char *pathspec); +int make_executable (const char *path); +int check_executable (const char *path); +char *strendzap (char *str, const char *pat); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); +void lt_setenv (const char *name, const char *value); +char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_update_exe_path (const char *name, const char *value); +void lt_update_lib_path (const char *name, const char *value); +char **prepare_spawn (char **argv); +void lt_dump_script (FILE *f); +EOF + + cat <= 0) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else + return 0; +} + +int +make_executable (const char *path) +{ + int rval = 0; + struct stat st; + + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); + if ((!path) || (!*path)) + return 0; + + if (stat (path, &st) >= 0) + { + rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); + } + return rval; +} + +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise + Does not chase symlinks, even on platforms that support them. +*/ +char * +find_executable (const char *wrapper) +{ + int has_slash = 0; + const char *p; + const char *p_next; + /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; + int tmp_len; + char *concat_name; + + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; + + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + } +#endif + + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char *path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char *q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR (*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = + XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + return NULL; +} + +char * +chase_symlinks (const char *pathspec) +{ +#ifndef S_ISLNK + return xstrdup (pathspec); +#else + char buf[LT_PATHMAX]; + struct stat s; + char *tmp_pathspec = xstrdup (pathspec); + char *p; + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) + { + has_symlinks = 1; + break; + } + + /* search backwards for last DIR_SEPARATOR */ + p = tmp_pathspec + strlen (tmp_pathspec) - 1; + while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + p--; + if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + { + /* no more DIR_SEPARATORS left */ + break; + } + *p = '\0'; + } + else + { + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); + + if (!has_symlinks) + { + return xstrdup (pathspec); + } + + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); +#endif +} + +char * +strendzap (char *str, const char *pat) +{ + size_t len, patlen; + + assert (str != NULL); + assert (pat != NULL); + + len = strlen (str); + patlen = strlen (pat); + + if (patlen <= len) + { + str += len - patlen; + if (strcmp (str, pat) == 0) + *str = '\0'; + } + return str; +} + +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} + +static void +lt_error_core (int exit_status, const char *file, + int line, const char *mode, + const char *message, va_list ap) +{ + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + + if (exit_status >= 0) + exit (exit_status); +} + +void +lt_fatal (const char *file, int line, const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); +} + +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} + +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} + +void +lt_setenv (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); + { +#ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ + char *str = xstrdup (value); + setenv (name, str, 1); +#else + int len = strlen (name) + 1 + strlen (value) + 1; + char *str = XMALLOC (char, len); + sprintf (str, "%s=%s", name, value); + if (putenv (str) != EXIT_SUCCESS) + { + XFREE (str); + } +#endif + } +} + +char * +lt_extend_str (const char *orig_value, const char *add, int to_end) +{ + char *new_value; + if (orig_value && *orig_value) + { + int orig_value_len = strlen (orig_value); + int add_len = strlen (add); + new_value = XMALLOC (char, add_len + orig_value_len + 1); + if (to_end) + { + strcpy (new_value, orig_value); + strcpy (new_value + orig_value_len, add); + } + else + { + strcpy (new_value, add); + strcpy (new_value + add_len, orig_value); + } + } + else + { + new_value = xstrdup (add); + } + return new_value; +} + +void +lt_update_exe_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + /* some systems can't cope with a ':'-terminated path #' */ + int len = strlen (new_value); + while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { + new_value[len-1] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +void +lt_update_lib_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' + cat <<"EOF" +} +EOF +} +# end: func_emit_cwrapperexe_src + +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $opt_debug + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + +# func_mode_link arg... +func_mode_link () +{ + $opt_debug + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra + # flag for every libtool invocation. + # allow_undefined=no + + # FIXME: Unfortunately, there are problems with the above when trying + # to make a dll which has undefined symbols, in which case not + # even a static library is built. For now, we need to specify + # -no-undefined on the libtool link line when we can be certain + # that all symbols are satisfied, otherwise we get a static library. + allow_undefined=yes + ;; + *) + allow_undefined=yes + ;; + esac + libtool_args=$nonopt + base_compile="$nonopt $@" + compile_command=$nonopt + finalize_command=$nonopt + + compile_rpath= + finalize_rpath= + compile_shlibpath= + finalize_shlibpath= + convenience= + old_convenience= + deplibs= + old_deplibs= + compiler_flags= + linker_flags= + dllsearchpath= + lib_search_path=`pwd` + inst_prefix_dir= + new_inherited_linker_flags= + + avoid_version=no + bindir= + dlfiles= + dlprefiles= + dlself=no + export_dynamic=no + export_symbols= + export_symbols_regex= + generated= + libobjs= + ltlibs= + module=no + no_install=no + objs= + non_pic_objects= + precious_files_regex= + prefer_static_libs=no + preload=no + prev= + prevarg= + release= + rpath= + xrpath= + perm_rpath= + temp_rpath= + thread_safe=no + vinfo= + vinfo_number=no + weak_libs= + single_module="${wl}-single_module" + func_infer_tag $base_compile + + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + break + ;; + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + func_warning "complete static linking is impossible in this configuration" + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=built + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac + build_libtool_libs=no + build_old_libs=yes + break + ;; + esac + done + + # See if our shared archives depend on static archives. + test -n "$old_archive_from_new_cmds" && build_old_libs=yes + + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg="$1" + shift + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result + func_append libtool_args " $func_quote_for_eval_result" + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + output) + func_append compile_command " @OUTPUT@" + func_append finalize_command " @OUTPUT@" + ;; + esac + + case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; + dlfiles|dlprefiles) + if test "$preload" = no; then + # Add the symbol object into the linking commands. + func_append compile_command " @SYMFILE@" + func_append finalize_command " @SYMFILE@" + preload=yes + fi + case $arg in + *.la | *.lo) ;; # We handle these cases below. + force) + if test "$dlself" = no; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + self) + if test "$prev" = dlprefiles; then + dlself=yes + elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + dlself=yes + else + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + *) + if test "$prev" = dlfiles; then + func_append dlfiles " $arg" + else + func_append dlprefiles " $arg" + fi + prev= + continue + ;; + esac + ;; + expsyms) + export_symbols="$arg" + test -f "$arg" \ + || func_fatal_error "symbol file \`$arg' does not exist" + prev= + continue + ;; + expsyms_regex) + export_symbols_regex="$arg" + prev= + continue + ;; + framework) + case $host in + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; + *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; + esac + prev= + continue + ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg + moreargs= + for fil in `cat "$save_arg"` + do +# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file + func_source "$arg" + + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi + + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi + + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" + + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + done + else + func_fatal_error "link input file \`$arg' does not exist" + fi + arg=$save_arg + prev= + continue + ;; + precious_regex) + precious_files_regex="$arg" + prev= + continue + ;; + release) + release="-$arg" + prev= + continue + ;; + rpath | xrpath) + # We need an absolute path. + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; + *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; + *) func_append xrpath " $arg" ;; + esac + fi + prev= + continue + ;; + shrext) + shrext_cmds="$arg" + prev= + continue + ;; + weak) + func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" + continue + ;; + *) + eval "$prev=\"\$arg\"" + prev= + continue + ;; + esac + fi # test -n "$prev" + + prevarg="$arg" + + case $arg in + -all-static) + if test -n "$link_static_flag"; then + # See comment for -static flag below, for more details. + func_append compile_command " $link_static_flag" + func_append finalize_command " $link_static_flag" + fi + continue + ;; + + -allow-undefined) + # FIXME: remove this flag sometime in the future. + func_fatal_error "\`-allow-undefined' must not be used because it is the default" + ;; + + -avoid-version) + avoid_version=yes + continue + ;; + + -bindir) + prev=bindir + continue + ;; + + -dlopen) + prev=dlfiles + continue + ;; + + -dlpreopen) + prev=dlprefiles + continue + ;; + + -export-dynamic) + export_dynamic=yes + continue + ;; + + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + func_fatal_error "more than one -exported-symbols argument is not allowed" + fi + if test "X$arg" = "X-export-symbols"; then + prev=expsyms + else + prev=expsyms_regex + fi + continue + ;; + + -framework) + prev=framework + continue + ;; + + -inst-prefix-dir) + prev=inst_prefix + continue + ;; + + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* + # so, if we see these flags be careful not to treat them like -L + -L[A-Z][A-Z]*:*) + case $with_gcc/$host in + no/*-*-irix* | /*-*-irix*) + func_append compile_command " $arg" + func_append finalize_command " $arg" + ;; + esac + continue + ;; + + -L*) + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ + func_fatal_error "cannot determine absolute directory name of \`$dir'" + dir="$absdir" + ;; + esac + case "$deplibs " in + *" -L$dir "* | *" $arg "*) + # Will only happen for absolute or sysroot arguments + ;; + *) + # Preserve sysroot, but never include relative directories + case $dir in + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; + esac + func_append lib_search_path " $dir" + ;; + esac + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; + *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + continue + ;; + + -l*) + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + # These systems don't actually have a C or math library (as such) + continue + ;; + *-*-os2*) + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework + func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; + esac + fi + func_append deplibs " $arg" + continue + ;; + + -module) + module=yes + continue + ;; + + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. + -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler + continue + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; + + -multi_module) + single_module="${wl}-multi_module" + continue + ;; + + -no-fast-install) + fast_install=no + continue + ;; + + -no-install) + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + # The PATH hackery in wrapper scripts is required on Windows + # and Darwin in order for the loader to find any dlls it needs. + func_warning "\`-no-install' is ignored for $host" + func_warning "assuming \`-no-fast-install' instead" + fast_install=no + ;; + *) no_install=yes ;; + esac + continue + ;; + + -no-undefined) + allow_undefined=no + continue + ;; + + -objectlist) + prev=objectlist + continue + ;; + + -o) prev=output ;; + + -precious-files-regex) + prev=precious_regex + continue + ;; + + -release) + prev=release + continue + ;; + + -rpath) + prev=rpath + continue + ;; + + -R) + prev=xrpath + continue + ;; + + -R*) + func_stripname '-R' '' "$arg" + dir=$func_stripname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + =*) + func_stripname '=' '' "$dir" + dir=$lt_sysroot$func_stripname_result + ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + continue + ;; + + -shared) + # The effects of -shared are defined in a previous loop. + continue + ;; + + -shrext) + prev=shrext + continue + ;; + + -static | -static-libtool-libs) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects + # would be equivalent was wrong. It would break on at least + # Digital Unix and AIX. + continue + ;; + + -thread-safe) + thread_safe=yes + continue + ;; + + -version-info) + prev=vinfo + continue + ;; + + -version-number) + prev=vinfo + vinfo_number=yes + continue + ;; + + -weak) + prev=weak + continue + ;; + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Xcompiler) + prev=xcompiler + continue + ;; + + -Xlinker) + prev=xlinker + continue + ;; + + -XCClinker) + prev=xcclinker + continue + ;; + + # -msg_* for osf cc + -msg_*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" + func_append compiler_flags " $arg" + continue + ;; + + # Some other compiler flag. + -* | +*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + + *.$objext) + # A standard object. + func_append objs " $arg" + ;; + + *.lo) + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file + func_source "$arg" + + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi + + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi + + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" + + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + ;; + + *.$libext) + # An archive. + func_append deplibs " $arg" + func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + + func_resolve_sysroot "$arg" + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. + func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. + func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else + func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; + + # Some other compiler argument. + *) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + esac # arg + + # Now actually substitute the argument into the commands. + if test -n "$arg"; then + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + done # argument parsing loop + + test -n "$prev" && \ + func_fatal_help "the \`$prevarg' option requires an argument" + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + + oldlibs= + # calculate the name of the file, without its directory + func_basename "$output" + outputname="$func_basename_result" + libobjs_save="$libobjs" + + if test -n "$shlibpath_var"; then + # get the directories listed in $shlibpath_var + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + else + shlib_search_path= + fi + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + + # Determine the type of output + case $output in + "") + func_fatal_help "you must specify an output file" + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; + *.la) linkmode=lib ;; + *) linkmode=prog ;; # Anything else should be a program. + esac + + specialdeplibs= + + libs= + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do + if $opt_preserve_dup_deps ; then + case "$libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append libs " $deplib" + done + + if test "$linkmode" = lib; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac + func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= + fi + + deplibs= + newdependency_libs= + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries + + case $linkmode in + lib) + passes="conv dlpreopen link" + for file in $dlfiles $dlprefiles; do + case $file in + *.la) ;; + *) + func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + ;; + esac + done + ;; + prog) + compile_deplibs= + finalize_deplibs= + alldeplibs=no + newdlfiles= + newdlprefiles= + passes="conv scan dlopen dlpreopen link" + ;; + *) passes="conv" + ;; + esac + + for pass in $passes; do + # The preopen pass in lib mode reverses $deplibs; put it back here + # so that -L comes before libs that need it for instance... + if test "$linkmode,$pass" = "lib,link"; then + ## FIXME: Find the place where the list is rebuilt in the wrong + ## order, and fix it there properly + tmp_deplibs= + for deplib in $deplibs; do + tmp_deplibs="$deplib $tmp_deplibs" + done + deplibs="$tmp_deplibs" + fi + + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan"; then + libs="$deplibs" + deplibs= + fi + if test "$linkmode" = prog; then + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then + # Collect and forward deplibs of preopened libtool libs + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= + func_resolve_sysroot "$lib" + case $lib in + *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library + # has declared as weak libs + for deplib in $dependency_libs; do + func_basename "$deplib" + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; + *) func_append deplibs " $deplib" ;; + esac + done + done + libs="$dlprefiles" + fi + if test "$pass" = dlopen; then + # Collect dlpreopened libraries + save_deplibs="$deplibs" + deplibs= + fi + + for deplib in $libs; do + lib= + found=no + case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append compiler_flags " $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -l*) + if test "$linkmode" != lib && test "$linkmode" != prog; then + func_warning "\`-l' is ignored for archives/objects" + continue + fi + func_stripname '-l' '' "$deplib" + name=$func_stripname_result + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then + if test "$search_ext" = ".la"; then + found=yes + else + found=no + fi + break 2 + fi + done + done + if test "$found" != yes; then + # deplib doesn't seem to be a libtool library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + else # deplib is a libtool library + # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, + # We need to do some special things here, and not later. + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + fi + fi + ;; # -l + *.ltframework) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -L*) + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" + ;; + esac # linkmode + continue + ;; # -L + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; + *.la) + func_resolve_sysroot "$deplib" + lib=$func_resolve_sysroot_result + ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + case $linkmode in + lib) + # Linking convenience modules into shared libraries is allowed, + # but linking other static libraries is non-portable. + case " $dlpreconveniencelibs " in + *" $deplib "*) ;; + *) + valid_a_lib=no + case $deplibs_check_method in + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then + valid_a_lib=yes + fi + ;; + pass_all) + valid_a_lib=yes + ;; + esac + if test "$valid_a_lib" != yes; then + echo + $ECHO "*** Warning: Trying to link with static lib archive $deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." + else + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + fi + ;; + esac + continue + ;; + prog) + if test "$pass" != link; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + continue + ;; + esac # linkmode + ;; # *.$libext + *.lo | *.$objext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + elif test "$linkmode" = prog; then + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append newdlfiles " $deplib" + fi + fi + continue + ;; + %DEPLIBS%) + alldeplibs=yes + continue + ;; + esac # case $deplib + + if test "$found" = yes || test -f "$lib"; then : + else + func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" + fi + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$lib" \ + || func_fatal_error "\`$lib' is not a valid libtool archive" + + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + + dlname= + dlopen= + dlpreopen= + libdir= + library_names= + old_library= + inherited_linker_flags= + # If the library was installed with an old release of libtool, + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no + avoidtemprpath= + + + # Read the .la file + func_source "$lib" + + # Convert "-framework foo" to "foo.ltframework" + if test -n "$inherited_linker_flags"; then + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + done + fi + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test "$pass" = conv; then + # Only check for convenience libraries + deplibs="$lib $deplibs" + if test -z "$libdir"; then + if test -z "$old_library"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done + continue + fi # $pass = conv + + + # Get the name of the library we link against. + linklib= + if test -n "$old_library" && + { test "$prefer_static_libs" = yes || + test "$prefer_static_libs,$installed" = "built,no"; }; then + linklib=$old_library + else + for l in $old_library $library_names; do + linklib="$l" + done + fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + + # This library was specified with -dlopen. + if test "$pass" = dlopen; then + if test -z "$libdir"; then + func_fatal_error "cannot -dlopen a convenience library: \`$lib'" + fi + if test -z "$dlname" || + test "$dlopen_support" != yes || + test "$build_libtool_libs" = no; then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. + func_append dlprefiles " $lib $dependency_libs" + else + func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen + + # We need an absolute path. + case $ladir in + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + *) + abs_ladir=`cd "$ladir" && pwd` + if test -z "$abs_ladir"; then + func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "passing it literally to the linker, although it might fail" + abs_ladir="$ladir" + fi + ;; + esac + func_basename "$lib" + laname="$func_basename_result" + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else + dir="$lt_sysroot$libdir" + absdir="$lt_sysroot$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later + func_append notinst_path " $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" + name=$func_stripname_result + + # This library was specified with -dlpreopen. + if test "$pass" = dlpreopen; then + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi + case "$host" in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both + # static and shared are present. Therefore, ensure we extract + # symbols from the import library if a shared library is present + # (otherwise, the dlopen module name will be incorrect). We do + # this by putting the import library name into $newdlprefiles. + # We recover the dlopen module name by 'saving' the la file + # name in a special purpose variable, and (later) extracting the + # dlname from the la file. + if test -n "$dlname"; then + func_tr_sh "$dir/$linklib" + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" + func_append newdlprefiles " $dir/$linklib" + else + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + fi + ;; + * ) + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + func_append newdlprefiles " $dir/$dlname" + else + func_append newdlprefiles " $dir/$linklib" + fi + ;; + esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then + # Link the convenience library + if test "$linkmode" = lib; then + deplibs="$dir/$old_library $deplibs" + elif test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$dir/$old_library $compile_deplibs" + finalize_deplibs="$dir/$old_library $finalize_deplibs" + else + deplibs="$lib $deplibs" # used for prog,scan pass + fi + continue + fi + + + if test "$linkmode" = prog && test "$pass" != link; then + func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no + if test "$link_all_deplibs" != no || test -z "$library_names" || + test "$build_libtool_libs" = no; then + linkalldeplibs=yes + fi + + tmp_libs= + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? + if test "$linkalldeplibs" = yes; then + deplibs="$deplib $deplibs" + else + # Need to hardcode shared library paths + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... + + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then + # We need to hardcode the library path + if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; + *) func_append temp_rpath "$absdir:" ;; + esac + fi + + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && + { test "$deplibs_check_method" = pass_all || + { test "$build_libtool_libs" = yes && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue + fi + fi + + link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes; then + use_static_libs=no + fi + if test -n "$library_names" && + { test "$use_static_libs" = no || test -z "$old_library"; }; then + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded + func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then + func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; + esac + # This is a shared library + + # Warn about portability, can't link against -module's on some + # systems (darwin). Don't bleat about dlopened modules though! + dlopenmodule="" + for dlpremoduletest in $dlprefiles; do + if test "X$dlpremoduletest" = "X$lib"; then + dlopenmodule="$dlpremoduletest" + break + fi + done + if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + echo + if test "$linkmode" = prog; then + $ECHO "*** Warning: Linking the executable $output against the loadable module" + else + $ECHO "*** Warning: Linking the shared library $output against the loadable module" + fi + $ECHO "*** $linklib is not portable!" + fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi + + if test -n "$old_archive_from_expsyms_cmds"; then + # figure out the soname + set dummy $library_names + shift + realname="$1" + shift + libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" + elif test -n "$soname_spec"; then + # bleh windows + case $host in + *cygwin* | mingw* | *cegcc*) + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + esac + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + + # Make a new name for the extract_expsyms_cmds to use + soroot="$soname" + func_basename "$soroot" + soname="$func_basename_result" + func_stripname 'lib' '.dll' "$soname" + newlib=libimp-$func_stripname_result.a + + # If the library has no export list, then create one now + if test -f "$output_objdir/$soname-def"; then : + else + func_verbose "extracting exported symbol list from \`$soname'" + func_execute_cmds "$extract_expsyms_cmds" 'exit $?' + fi + + # Create $newlib + if test -f "$output_objdir/$newlib"; then :; else + func_verbose "generating import library for \`$soname'" + func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' + fi + # make sure the library variables are pointing to the new library + dir=$output_objdir + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + + if test "$linkmode" = prog || test "$opt_mode" != relink; then + add_shlibpath= + add_dir= + add= + lib_linked=yes + case $hardcode_action in + immediate | unsupported) + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + case $host in + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; + *-*-darwin* ) + # if the lib is a (non-dlopened) module then we can not + # link against it, someone is ignoring the earlier warnings + if /usr/bin/file -L $add 2> /dev/null | + $GREP ": [^:]* bundle" >/dev/null ; then + if test "X$dlopenmodule" != "X$lib"; then + $ECHO "*** Warning: lib $linklib is a module, not a shared library" + if test -z "$old_library" ; then + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" + else + add="$dir/$old_library" + fi + elif test -n "$old_library"; then + add="$dir/$old_library" + fi + fi + esac + elif test "$hardcode_minus_L" = no; then + case $host in + *-*-sunos*) add_shlibpath="$dir" ;; + esac + add_dir="-L$dir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = no; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + relink) + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$dir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$absdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + *) lib_linked=no ;; + esac + + if test "$lib_linked" != yes; then + func_fatal_configuration "unsupported hardcode properties" + fi + + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then + test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" + test -n "$add" && compile_deplibs="$add $compile_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + if test "$hardcode_direct" != yes && + test "$hardcode_minus_L" != yes && + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + + if test "$linkmode" = prog || test "$opt_mode" = relink; then + add_shlibpath= + add_dir= + add= + # Finalize command for both is simple: just hardcode it. + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$libdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$libdir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" + fi + else + # We cannot seem to hardcode it, guess we'll fake it. + add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + fi + + if test "$linkmode" = prog; then + test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" + test -n "$add" && finalize_deplibs="$add $finalize_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + fi + fi + elif test "$linkmode" = prog; then + # Here we assume that one of hardcode_direct or hardcode_minus_L + # is not unsupported. This is valid on all known static and + # shared platforms. + if test "$hardcode_direct" != unsupported; then + test -n "$old_library" && linklib="$old_library" + compile_deplibs="$dir/$linklib $compile_deplibs" + finalize_deplibs="$dir/$linklib $finalize_deplibs" + else + compile_deplibs="-l$name -L$dir $compile_deplibs" + finalize_deplibs="-l$name -L$dir $finalize_deplibs" + fi + elif test "$build_libtool_libs" = yes; then + # Not a shared library + if test "$deplibs_check_method" != pass_all; then + # We're trying link a shared library against a static one + # but the system doesn't support it. + + # Just print a warning and add the library to dependency_libs so + # that the program can be linked against the static library. + echo + $ECHO "*** Warning: This system can not link to static lib archive $lib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." + if test "$module" = yes; then + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + else + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test "$linkmode" = lib; then + if test -n "$dependency_libs" && + { test "$hardcode_into_libs" != yes || + test "$build_old_libs" = yes || + test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do + case $libdir in + -R*) func_stripname '-R' '' "$libdir" + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; + *) func_append xrpath " $temp_xrpath";; + esac;; + *) func_append temp_deplibs " $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + + func_append newlib_search_path " $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi + func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do + path= + case $deplib in + -L*) path="$deplib" ;; + *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." + dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + func_warning "cannot determine absolute directory name of \`$dir'" + absdir="$dir" + fi + ;; + esac + if $GREP "^installed=no" $deplib > /dev/null; then + case $host in + *-*-darwin*) + depdepl= + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done + if test -f "$absdir/$objdir/$depdepl" ; then + depdepl="$absdir/$objdir/$depdepl" + darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -z "$darwin_install_name"; then + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + path= + fi + fi + ;; + *) + path="-L$absdir/$objdir" + ;; + esac + else + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ + func_warning "\`$deplib' seems to be moved" + + path="-L$absdir" + fi + ;; + esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$path $deplibs" ;; + esac + done + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs + if test "$pass" = link; then + if test "$linkmode" = "prog"; then + compile_deplibs="$new_inherited_linker_flags $compile_deplibs" + finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" + else + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + fi + fi + dependency_libs="$newdependency_libs" + if test "$pass" = dlpreopen; then + # Link the dlpreopened libraries before other libraries + for deplib in $save_deplibs; do + deplibs="$deplib $deplibs" + done + fi + if test "$pass" != dlopen; then + if test "$pass" != conv; then + # Make sure lib_search_path contains only unique directories. + lib_search_path= + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; + *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= + fi + + if test "$linkmode,$pass" != "prog,link"; then + vars="deplibs" + else + vars="compile_deplibs finalize_deplibs" + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order + eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so + # that some nasty dependency loop isn't accidentally + # broken: + #new_libs="$deplib $new_libs" + # Pragmatically, this seems to cause very few problems in + # practice: + case $deplib in + -L*) new_libs="$deplib $new_libs" ;; + -R*) ;; + *) + # And here is the reason: when a library appears more + # than once as an explicit dependence of a library, or + # is implicitly linked in more than once by the + # compiler, it is considered special, and multiple + # occurrences thereof are not removed. Compare this + # with having the same library being listed as a + # dependency of multiple other libraries: in this case, + # we know (pedantically, we assume) the library does not + # need to be listed more than once, so we keep only the + # last copy. This is not always right, but it is rare + # enough that we require users that really mean to play + # such unportable linking tricks to link the library + # using -Wl,-lname, so that libtool does not consider it + # for duplicate removal. + case " $specialdeplibs " in + *" $deplib "*) new_libs="$deplib $new_libs" ;; + *) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$deplib $new_libs" ;; + esac + ;; + esac + ;; + esac + done + tmp_libs= + for deplib in $new_libs; do + case $deplib in + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; + *) func_append tmp_libs " $deplib" ;; + esac + ;; + *) func_append tmp_libs " $deplib" ;; + esac + done + eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) + i="" + ;; + esac + if test -n "$i" ; then + func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs + done # for pass + if test "$linkmode" = prog; then + dlfiles="$newdlfiles" + fi + if test "$linkmode" = prog || test "$linkmode" = lib; then + dlprefiles="$newdlprefiles" + fi + + case $linkmode in + oldlib) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for archives" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for archives" ;; + esac + + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for archives" + + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for archives" + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for archives" + + test -n "$release" && \ + func_warning "\`-release' is ignored for archives" + + test -n "$export_symbols$export_symbols_regex" && \ + func_warning "\`-export-symbols' is ignored for archives" + + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" + func_append objs "$old_deplibs" + ;; + + lib) + # Make sure we only generate libraries of the form `libNAME.la'. + case $outputname in + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ + func_fatal_help "libtool library \`$output' must begin with \`lib'" + + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result + fi + ;; + esac + + if test -n "$objs"; then + if test "$deplibs_check_method" != pass_all; then + func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + else + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" + func_append libobjs " $objs" + fi + fi + + test "$dlself" != no && \ + func_warning "\`-dlopen self' is ignored for libtool libraries" + + set dummy $rpath + shift + test "$#" -gt 1 && \ + func_warning "ignoring multiple \`-rpath's for a libtool library" + + install_libdir="$1" + + oldlibs= + if test -z "$rpath"; then + if test "$build_libtool_libs" = yes; then + # Building a libtool convenience library. + # Some compilers have problems with a `.al' extension so + # convenience libraries should have the same extension an + # archive normally would. + oldlibs="$output_objdir/$libname.$libext $oldlibs" + build_libtool_libs=convenience + build_old_libs=yes + fi + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + + test -n "$release" && \ + func_warning "\`-release' is ignored for convenience libraries" + else + + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 + shift + IFS="$save_ifs" + + test -n "$7" && \ + func_fatal_help "too many parameters to \`-version-info'" + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible + + case $vinfo_number in + yes) + number_major="$1" + number_minor="$2" + number_revision="$3" + # + # There are really only two kinds -- those that + # use the current revision as the major version + # and those that subtract age and use age as + # a minor version. But, then there is irix + # which has an extra 1 added just for fun + # + case $version_type in + # correct linux to gnu/linux during the next big refactor + darwin|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|qnx|sunos) + current="$number_major" + revision="$number_minor" + age="0" + ;; + irix|nonstopux) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_minor" + lt_irix_increment=no + ;; + esac + ;; + no) + current="$1" + revision="$2" + age="$3" + ;; + esac + + # Check that each of the things are valid numbers. + case $current in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "CURRENT \`$current' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $revision in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "REVISION \`$revision' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $age in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "AGE \`$age' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + if test "$age" -gt "$current"; then + func_error "AGE \`$age' is greater than the current interface number \`$current'" + func_fatal_error "\`$vinfo' is not valid version information" + fi + + # Calculate the version variables. + major= + versuffix= + verstring= + case $version_type in + none) ;; + + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... + func_arith $current + 1 + minor_current=$func_arith_result + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + + freebsd-aout) + major=".$current" + versuffix=".$current.$revision"; + ;; + + freebsd-elf) + major=".$current" + versuffix=".$current" + ;; + + irix | nonstopux) + if test "X$lt_irix_increment" = "Xno"; then + func_arith $current - $age + else + func_arith $current - $age + 1 + fi + major=$func_arith_result + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; + esac + verstring="$verstring_prefix$major.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$revision + while test "$loop" -ne 0; do + func_arith $revision - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring_prefix$major.$iface:$verstring" + done + + # Before this point, $major must not contain `.'. + major=.$major + versuffix="$major.$revision" + ;; + + linux) # correct to gnu/linux during the next big refactor + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + ;; + + osf) + func_arith $current - $age + major=.$func_arith_result + versuffix=".$current.$age.$revision" + verstring="$current.$age.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$age + while test "$loop" -ne 0; do + func_arith $current - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring:${iface}.0" + done + + # Make executables depend on our current version. + func_append verstring ":${current}.0" + ;; + + qnx) + major=".$current" + versuffix=".$current" + ;; + + sunos) + major=".$current" + versuffix=".$current.$revision" + ;; + + windows) + # Use '-' rather than '.', since we only want one + # extension on DOS 8.3 filesystems. + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + + *) + func_fatal_configuration "unknown library version type \`$version_type'" + ;; + esac + + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring= + ;; + *) + verstring="0.0" + ;; + esac + if test "$need_version" = no; then + versuffix= + else + versuffix=".0.0" + fi + fi + + # Remove version info from name if versioning should be avoided + if test "$avoid_version" = yes && test "$need_version" = no; then + major= + versuffix= + verstring="" + fi + + # Check to see if the archive will have undefined symbols. + if test "$allow_undefined" = yes; then + if test "$allow_undefined_flag" = unsupported; then + func_warning "undefined symbols not allowed in $host shared libraries" + build_libtool_libs=no + build_old_libs=yes + fi + else + # Don't allow undefined symbols. + allow_undefined_flag="$no_undefined_flag" + fi + + fi + + func_generate_dlsyms "$libname" "$libname" "yes" + func_append libobjs " $symfileobj" + test "X$libobjs" = "X " && libobjs= + + if test "$opt_mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= + tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in + *.$objext | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then + if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi + func_append removelist " $p" + ;; + *) ;; + esac + done + test -n "$removelist" && \ + func_show_eval "${RM}r \$removelist" + fi + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + fi + + # Eliminate all temporary directories. + #for path in $notinst_path; do + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` + #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do + func_replace_sysroot "$libdir" + func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi + + # Make sure dlfiles contains only unique files that won't be dlpreopened + old_dlfiles="$dlfiles" + dlfiles= + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; + *) func_append dlfiles " $lib" ;; + esac + done + + # Make sure dlprefiles contains only unique files + old_dlprefiles="$dlprefiles" + dlprefiles= + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; + *) func_append dlprefiles " $lib" ;; + esac + done + + if test "$build_libtool_libs" = yes; then + if test -n "$rpath"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) + # these systems don't actually have a c library (as such)! + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then + func_append deplibs " -lc" + fi + ;; + esac + fi + + # Transform deplibs into only deplibs that can be linked in shared. + name_save=$name + libname_save=$libname + release_save=$release + versuffix_save=$versuffix + major_save=$major + # I'm not sure if I'm treating the release correctly. I think + # release should show up in the -l (ie -lgmp5) so we don't want to + # add it in twice. Is that correct? + release="" + versuffix="" + major="" + newdeplibs= + droppeddeps=no + case $deplibs_check_method in + pass_all) + # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behavior. + newdeplibs=$deplibs + ;; + test_compile) + # This code stresses the "libraries are programs" paradigm to its + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. + $opt_dry_run || $RM conftest.c + cat > conftest.c </dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | + $GREP " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an + # endless loop below, in case of cyclic links. + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? + potlib="$potent_lib" + while test -h "$potlib" 2>/dev/null; do + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + case $potliblink in + [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + esac + done + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for file magic test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a file magic. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + for a_deplib in $deplibs; do + case $a_deplib in + -l*) + func_stripname -l '' "$a_deplib" + name=$func_stripname_result + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) + func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then + libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a regex pattern. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + none | unknown | *) + newdeplibs="" + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + for i in $predeps $postdeps ; do + # can't use Xsed below, because $i might contain '/' + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + done + fi + case $tmp_deplibs in + *[!\ \ ]*) + echo + if test "X$deplibs_check_method" = "Xnone"; then + echo "*** Warning: inter-library dependencies are not supported in this platform." + else + echo "*** Warning: inter-library dependencies are not known to be supported." + fi + echo "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + ;; + esac + ;; + esac + versuffix=$versuffix_save + major=$major_save + release=$release_save + libname=$libname_save + name=$name_save + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library with the System framework + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` + ;; + esac + + if test "$droppeddeps" = yes; then + if test "$module" = yes; then + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO "*** dependencies of module $libname. Therefore, libtool will create" + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + else + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." + + if test "$allow_undefined" = no; then + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + fi + fi + # Done checking deplibs! + deplibs=$newdeplibs + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + case $host in + *-*-darwin*) + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; + esac + ;; + *) func_append new_libs " $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= + dlname= + + # Test again, we may have decided not to build it any more + if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac + if test "$hardcode_into_libs" = yes; then + # Hardcode the library paths + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_append perm_rpath " $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath="$finalize_shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. + eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift + + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + if test -z "$dlname"; then + dlname=$soname + fi + + lib="$output_objdir/$realname" + linknames= + for link + do + func_append linknames " $link" + done + + # Use standard objects if they are pic + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` + test "X$libobjs" = "X " && libobjs= + + delfiles= + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" + func_append delfiles " $export_symbols" + fi + + orig_export_symbols= + case $host_os in + cygwin* | mingw* | cegcc*) + if test -n "$export_symbols" && test -z "$export_symbols_regex"; then + # exporting using user supplied symfile + if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + # and it's NOT already a .def file. Must figure out + # which of the given symbols are data symbols and tag + # them as such. So, trigger use of export_symbols_cmds. + # export_symbols gets reassigned inside the "prepare + # the list of exported symbols" if statement, so the + # include_expsyms logic still works. + orig_export_symbols="$export_symbols" + export_symbols= + always_export_symbols=yes + fi + fi + ;; + esac + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' + for cmd1 in $cmds; do + IFS="$save_ifs" + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. + func_verbose "using reloadable object file for export list..." + skipped_export=: + # Break out early, otherwise skipped_export may be + # set to false by a later but shorter cmd. + break + fi + done + IFS="$save_ifs" + if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + fi + + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + + tmp_deplibs= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) + func_append tmp_deplibs " $test_deplib" + ;; + esac + done + deplibs="$tmp_deplibs" + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec" && + test "$compiler_needs_object" = yes && + test -z "$libobjs"; then + # extract the archives, so we have objects to list. + # TODO: could optimize this to just extract one archive. + whole_archive_flag_spec= + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + + func_extract_archives $gentop $convenience + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking + if test "$opt_mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi + + if test "X$skipped_export" != "X:" && + func_len " $test_cmds" && + len=$func_len_result && + test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # The command line is too long to link in one step, link piecewise + # or, if using GNU ld and skipped_export is not :, use a linker + # script. + + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we + # want to use save_libobjs as it was before + # whole_archive_flag_spec was expanded, because we can't + # assume the linker understands whole_archive_flag_spec. + # This may have to be revisited, in case too many + # convenience libraries get linked in and end up exceeding + # the spec. + if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + fi + save_output=$output + func_basename "$output" + output_la=$func_basename_result + + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= + last_robj= + k=1 + + if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then + output=${output_objdir}/${output_la}.lnkscript + func_verbose "creating GNU ld script: $output" + echo 'INPUT (' > $output + for obj in $save_libobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" + : > $output + set x $save_libobjs + shift + firstobj= + if test "$compiler_needs_object" = yes; then + firstobj="$1 " + shift + fi + for obj + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext + eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + if test "X$objlist" = X || + test "$len" -lt "$max_cmd_len"; then + func_append objlist " $obj" + else + # The command $test_cmds is almost too long, add a + # command to the queue. + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 + k=$func_arith_result + output=$output_objdir/$output_la-${k}.$objext + objlist=" $obj" + func_len " $last_robj" + func_arith $len0 + $func_len_result + len=$func_arith_result + fi + done + # Handle the remaining objects by creating one last + # reloadable object file. All subsequent reloadable object + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi + func_append delfiles " $output" + + else + output= + fi + + if ${skipped_export-false}; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi + + test -n "$save_libobjs" && + func_verbose "creating a temporary reloadable object file: $output" + + # Loop through the commands generated above and execute them. + save_ifs="$IFS"; IFS='~' + for cmd in $concat_cmds; do + IFS="$save_ifs" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS="$save_ifs" + + if test -n "$export_symbols_regex" && ${skipped_export-false}; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + + if ${skipped_export-false}; then + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + fi + + libobjs=$output + # Restore the value of output. + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds + else + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + cmds=$archive_expsym_cmds + else + cmds=$archive_cmds + fi + fi + fi + + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. + eval cmds=\"\$cmds~\$RM $delfiles\" + fi + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS="$save_ifs" + + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then + func_show_eval '${RM}r "$gentop"' + fi + fi + + exit $EXIT_SUCCESS + fi + + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + fi + done + + # If -module or -export-dynamic was specified, set the dlname. + if test "$module" = yes || test "$export_dynamic" = yes; then + # On all known operating systems, these are identical. + dlname="$soname" + fi + fi + ;; + + obj) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for objects" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for objects" ;; + esac + + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for objects" + + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for objects" + + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for objects" + + test -n "$release" && \ + func_warning "\`-release' is ignored for objects" + + case $output in + *.lo) + test -n "$objs$old_deplibs" && \ + func_fatal_error "cannot build library object \`$output' from non-libtool objects" + + libobj=$output + func_lo2o "$libobj" + obj=$func_lo2o_result + ;; + *) + libobj= + obj="$output" + ;; + esac + + # Delete the old objects. + $opt_dry_run || $RM $obj $libobj + + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # the extraction. + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. + wl= + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + else + gentop="$output_objdir/${obj}x" + func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + + output="$obj" + func_execute_cmds "$reload_cmds" 'exit $?' + + # Exit if we aren't doing a library object file. + if test -z "$libobj"; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS + fi + + if test "$build_libtool_libs" != yes; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi + + if test -n "$pic_flag" || test "$pic_mode" != default; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" + func_execute_cmds "$reload_cmds" 'exit $?' + fi + + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS + ;; + + prog) + case $host in + *cygwin*) func_stripname '' '.exe' "$output" + output=$func_stripname_result.exe;; + esac + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for programs" + + test -n "$release" && \ + func_warning "\`-release' is ignored for programs" + + test "$preload" = yes \ + && test "$dlopen_support" = unknown \ + && test "$dlopen_self" = unknown \ + && test "$dlopen_self_static" = unknown && \ + func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` + ;; + esac + + case $host in + *-*-darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + # But is supposedly fixed on 10.4 or later (yay!). + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" + ;; + esac + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; + esac + ;; + *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. + for libdir in $rpath $xrpath; do + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + fi + + # Now hardcode the library paths + rpath= + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; + *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" + + rpath= + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; + *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" + + if test -n "$libobjs" && test "$build_old_libs" = yes; then + # Transform all the library objects into standard objects. + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + fi + + func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + + # template prelinking step + if test -n "$prelink_cmds"; then + func_execute_cmds "$prelink_cmds" 'exit $?' + fi + + wrappers_required=yes + case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; + *cygwin* | *mingw* ) + if test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + *) + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + esac + if test "$wrappers_required" = no; then + # Replace the output file specification. + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + link_command="$compile_command$compile_rpath" + + # We have no uninstalled library dependencies, so finalize right now. + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + fi + + exit $exit_status + fi + + if test -n "$compile_shlibpath$finalize_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi + + compile_var= + finalize_var= + if test -n "$runpath_var"; then + if test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + if test -n "$finalize_perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do + func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + fi + + if test "$no_install" = yes; then + # We don't need to create a wrapper script. + link_command="$compile_var$compile_command$compile_rpath" + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + # Delete the old output file. + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + exit $EXIT_SUCCESS + fi + + if test "$hardcode_action" = relink; then + # Fast installation is not supported + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "\`$output' will be relinked during installation" + else + if test "$fast_install" != no; then + link_command="$finalize_var$compile_command$finalize_rpath" + if test "$fast_install" = yes; then + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + else + # fast_install is set to needless + relink_command= + fi + else + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + fi + fi + + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + + # Delete the old output files. + $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname + + func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + # Now create the wrapper script. + func_verbose "creating $output" + + # Quote the relink command for shipping. + if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + fi + + # Only actually do things if not in dry run mode. + $opt_dry_run || { + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in + *.exe) func_stripname '' '.exe' "$output" + output=$func_stripname_result ;; + esac + # test for cygwin because mv fails w/o .exe extensions + case $host in + *cygwin*) + exeext=.exe + func_stripname '' '.exe' "$outputname" + outputname=$func_stripname_result ;; + *) exeext= ;; + esac + case $host in + *cygwin* | *mingw* ) + func_dirname_and_basename "$output" "" "." + output_name=$func_basename_result + output_path=$func_dirname_result + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $RM $cwrappersource $cwrapper + trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + func_emit_cwrapperexe_src > $cwrappersource + + # The wrapper executable is built using the $host compiler, + # because it contains $host paths and files. If cross- + # compiling, it, like the target executable, must be + # executed on the $host or under an emulation environment. + $opt_dry_run || { + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + $STRIP $cwrapper + } + + # Now, create the wrapper script for func_source use: + func_ltwrapper_scriptname $cwrapper + $RM $func_ltwrapper_scriptname_result + trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 + $opt_dry_run || { + # note: this script will not be executed, so do not chmod. + if test "x$build" = "x$host" ; then + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result + fi + } + ;; + * ) + $RM $output + trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 + + func_emit_wrapper no > $output + chmod +x $output + ;; + esac + } + exit $EXIT_SUCCESS + ;; + esac + + # See if we need to build an old-fashioned archive. + for oldlib in $oldlibs; do + + if test "$build_libtool_libs" = convenience; then + oldobjs="$libobjs_save $symfileobj" + addlibs="$convenience" + build_libtool_libs=no + else + if test "$build_libtool_libs" = module; then + oldobjs="$libobjs_save" + build_libtool_libs=no + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then + func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" + fi + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + + func_extract_archives $gentop $addlibs + func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + cmds=$old_archive_from_new_cmds + else + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles + func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have + # to avoid creating archives with duplicate basenames if we + # might have to extract them afterwards, e.g., when creating a + # static archive out of a convenience library, or when linking + # the entirety of a libtool archive into another (currently + # not supported by libtool). + if (for obj in $oldobjs + do + func_basename "$obj" + $ECHO "$func_basename_result" + done | sort | sort -uc >/dev/null 2>&1); then + : + else + echo "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= + counter=1 + for obj in $save_oldobjs + do + func_basename "$obj" + objbase="$func_basename_result" + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) + while :; do + # Make sure we don't pick an alternate name that also + # overlaps. + newobj=lt$counter-$objbase + func_arith $counter + 1 + counter=$func_arith_result + case " $oldobjs " in + *[\ /]"$newobj "*) ;; + *) if test ! -f "$gentop/$newobj"; then break; fi ;; + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" + ;; + *) func_append oldobjs " $obj" ;; + esac + done + fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result + eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs + oldobjs= + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj + done + eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + for obj in $save_oldobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + func_append objlist " $obj" + if test "$len" -lt "$max_cmd_len"; then + : + else + # the above command should be used before it gets too long + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi + done + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + func_execute_cmds "$cmds" 'exit $?' + done + + test -n "$generated" && \ + func_show_eval "${RM}r$generated" + + # Now create the libtool archive. + case $output in + *.la) + old_library= + test "$build_old_libs" = yes && old_library="$libname.$libext" + func_verbose "creating $output" + + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done + # Quote the link command for shipping. + relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + if test "$hardcode_automatic" = yes ; then + relink_command= + fi + + # Only create the output if not a dry run. + $opt_dry_run || { + for installed in no yes; do + if test "$installed" = yes; then + if test -z "$install_libdir"; then + break + fi + output="$output_objdir/$outputname"i + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do + case $deplib in + *.la) + func_basename "$deplib" + name="$func_basename_result" + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" + ;; + *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" + newdlfiles= + + for lib in $dlfiles; do + case $lib in + *.la) + func_basename "$lib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; + *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + *.la) + # Only pass preopened files to the pseudo-archive (for + # eventual linking with the app. that links it) if we + # didn't already link the preopened objects directly into + # the library: + func_basename "$lib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done + dlprefiles="$newdlprefiles" + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlfiles " $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlprefiles " $abs" + done + dlprefiles="$newdlprefiles" + fi + $RM $output + # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test "x$bindir" != x ; + then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; + esac + $ECHO > $output "\ +# $outputname - a libtool library file +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='$tdlname' + +# Names of this library. +library_names='$library_names' + +# The name of the static archive. +old_library='$old_library' + +# Linker flags that can not go in dependency_libs. +inherited_linker_flags='$new_inherited_linker_flags' + +# Libraries that this one depends upon. +dependency_libs='$dependency_libs' + +# Names of additional weak libraries provided by this library +weak_library_names='$weak_libs' + +# Version information for $libname. +current=$current +age=$age +revision=$revision + +# Is this an already installed library? +installed=$installed + +# Should we warn about portability when linking against -modules? +shouldnotlink=$module + +# Files to dlopen/dlpreopen +dlopen='$dlfiles' +dlpreopen='$dlprefiles' + +# Directory that this library needs to be installed in: +libdir='$install_libdir'" + if test "$installed" = no && test "$need_relink" = yes; then + $ECHO >> $output "\ +relink_command=\"$relink_command\"" + fi + done + } + + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. + func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' + ;; + esac + exit $EXIT_SUCCESS +} + +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} + + +# func_mode_uninstall arg... +func_mode_uninstall () +{ + $opt_debug + RM="$nonopt" + files= + rmforce= + exit_status=0 + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" + + for arg + do + case $arg in + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; + esac + done + + test -z "$RM" && \ + func_fatal_help "you must specify an RM program" + + rmdirs= + + for file in $files; do + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then + odir="$objdir" + else + odir="$dir/$objdir" + fi + func_basename "$file" + name="$func_basename_result" + test "$opt_mode" = uninstall && odir="$dir" + + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then + case " $rmdirs " in + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; + esac + fi + + # Don't error if the file doesn't exist and rm -f was used. + if { test -L "$file"; } >/dev/null 2>&1 || + { test -h "$file"; } >/dev/null 2>&1 || + test -f "$file"; then + : + elif test -d "$file"; then + exit_status=1 + continue + elif test "$rmforce" = yes; then + continue + fi + + rmfiles="$file" + + case $name in + *.la) + # Possibly a libtool archive, so verify it. + if func_lalib_p "$file"; then + func_source $dir/$name + + # Delete the libtool libraries and symlinks. + for n in $library_names; do + func_append rmfiles " $odir/$n" + done + test -n "$old_library" && func_append rmfiles " $odir/$old_library" + + case "$opt_mode" in + clean) + case " $library_names " in + *" $dlname "*) ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then + # Do each command in the postuninstall commands. + func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + fi + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. + func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + fi + # FIXME: should reinstall the best remaining shared library. + ;; + esac + fi + ;; + + *.lo) + # Possibly a libtool object, so verify it. + if func_lalib_p "$file"; then + + # Read the .lo file + func_source $dir/$name + + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && + test "$pic_object" != none; then + func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then + func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) + if test "$opt_mode" = clean ; then + noexename=$name + case $file in + *.exe) + func_stripname '' '.exe' "$file" + file=$func_stripname_result + func_stripname '' '.exe' "$name" + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe + func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. + if func_ltwrapper_p "$file"; then + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result + func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename + fi + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then + func_append rmfiles " $odir/lt-${noexename}.c" + fi + fi + fi + ;; + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do + if test -d "$dir"; then + func_show_eval "rmdir $dir >/dev/null 2>&1" + fi + done + + exit $exit_status +} + +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} + +test -z "$opt_mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" +} + +test -z "$exec_cmd" && \ + func_fatal_help "invalid operation mode \`$opt_mode'" + +if test -n "$exec_cmd"; then + eval exec "$exec_cmd" + exit $EXIT_FAILURE +fi + +exit $exit_status + + +# The TAGs below are defined such that we never get into a situation +# in which we disable both kinds of libraries. Given conflicting +# choices, we go for a static library, that is the most portable, +# since we can't tell whether shared libraries were disabled because +# the user asked for that or because the platform doesn't support +# them. This is particularly important on AIX, because we don't +# support having both static and shared libraries enabled at the same +# time on that platform, so we default to a shared-only configuration. +# If a disable-shared tag is given, we'll fallback to a static-only +# configuration. But we'll never go from static-only to shared-only. + +# ### BEGIN LIBTOOL TAG CONFIG: disable-shared +build_libtool_libs=no +build_old_libs=yes +# ### END LIBTOOL TAG CONFIG: disable-shared + +# ### BEGIN LIBTOOL TAG CONFIG: disable-static +build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` +# ### END LIBTOOL TAG CONFIG: disable-static + +# Local Variables: +# mode:shell-script +# sh-indentation:2 +# End: +# vi:sw=2 + diff --git a/m4/libtool.m4 b/m4/libtool.m4 new file mode 100644 index 0000000..44e0ecf --- /dev/null +++ b/m4/libtool.m4 @@ -0,0 +1,7982 @@ +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +]) + +# serial 57 LT_INIT + + +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) + + +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) + + +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +_LT_SETUP + +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) + + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +m4_defun([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +]) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + +_LT_CHECK_OBJDIR + +m4_require([_LT_TAG_COMPILER])dnl + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + _LT_PATH_MAGIC + fi + ;; +esac + +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP + + +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from `configure', and `config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# `config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain="$ac_aux_dir/ltmain.sh" +])# _LT_PROG_LTMAIN + + +## ------------------------------------- ## +## Accumulate code for creating libtool. ## +## ------------------------------------- ## + +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the `libtool' +# label. + + +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) + + +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) +]) + + +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) + + + +## ------------------------ ## +## FIXME: Eliminate VARNAME ## +## ------------------------ ## + + +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) + + +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) + + +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) + + +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +# ------------------------------------ +# Quote a variable value, and forward it to `config.status' so that its +# declaration there will have the same value as in `configure'. VARNAME +# must have a single quote delimited value for this to work. +m4_define([_LT_CONFIG_STATUS_DECLARE], +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) + + +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags="_LT_TAGS"dnl +]) + + +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) + + +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) + + +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + + +# _LT_CONFIG_COMMANDS +# ------------------- +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into `config.status', and then the shell code to quote escape them in +# for loops in `config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +_LT_OUTPUT_LIBTOOL_INIT +]) + +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# `#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test $lt_write_fail = 0 && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT + +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) + +cat >>"$CONFIG_LT" <<\_LTEOF +lt_cl_silent=false +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD + +lt_cl_help="\ +\`$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. + +Usage: $[0] [[OPTIONS]] + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + +Report bugs to ." + +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. + +Copyright (C) 2011 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." + +while test $[#] != 0 +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try \`$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try \`$[0] --help' for more information.]) ;; + esac + shift +done + +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null +fi +_LTEOF + +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +lt_cl_success=: +test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) +])# LT_OUTPUT + + +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +_LT_COPYING +_LT_LIBTOOL_TAGS + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + _LT_PROG_LTMAIN + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + _LT_PROG_REPLACE_SHELLFNS + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" + +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG + + +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) + + +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) + + +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG + + +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG + + +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG + +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) + + +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +])# _LT_LINKER_BOILERPLATE + +# _LT_REQUIRED_DARWIN_CHECKS +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) + + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +]) + + +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + m4_if([$1], [CXX], +[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +]) + +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl +if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi +])# _LT_SYS_MODULE_PATH_AIX + + +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + + + +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). +m4_defun([_LT_PROG_ECHO_BACKSLASH], +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +case "$ECHO" in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac + +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) + +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) +])# _LT_PROG_ECHO_BACKSLASH + + +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[ --with-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and in which our libraries should be installed.])]) + +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks="$enable_libtool_lock" +])# _LT_ENABLE_LOCK + + +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[_LT_PROG_AR + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) +])# _LT_CMD_OLD_ARCHIVE + + +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $RM conftest* +]) + +if test x"[$]$2" = xyes; then + m4_if([$5], , :, [$5]) +else + m4_if([$6], , :, [$6]) +fi +])# _LT_COMPILER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + + +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" +]) + +if test x"[$]$2" = xyes; then + m4_if([$4], , :, [$4]) +else + m4_if([$5], , :, [$5]) +fi +])# _LT_LINKER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) + + +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac +]) +if test -n $lt_cv_sys_max_cmd_len ; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) +fi +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN + +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) + + +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN + + +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "$cross_compiling" = yes; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +[#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +}] +_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 + fi +fi +rm -fr conftest* +])# _LT_TRY_DLOPEN_SELF + + +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) + ]) + ]) + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF + +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + + +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +]) +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O + + +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- +# Check to see if we can do hard links to lock some files if needed +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) + +hard_links="nottested" +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) + if test "$hard_links" = no; then + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + need_locks=warn + fi +else + need_locks=no +fi +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS + + +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", + [Define to the sub-directory in which libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR + + +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- +# Check hardcoding attributes. +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + # Linking always hardcodes the temporary library directory. + _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || + test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH + + +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB + + +# _LT_SYS_DYNAMIC_LINKER([TAG]) +# ----------------------------- +# PORTME Fill in your ld.so characteristics +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) +m4_if([$1], + [], [ +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[[4-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[[45]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[23]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[[3-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], + [Run-time system search path for libraries]) +])# _LT_SYS_DYNAMIC_LINKER + + +# _LT_PATH_TOOL_PREFIX(TOOL) +# -------------------------- +# find a file program which can recognize shared library +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$1; then + lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac]) +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX + +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) + + +# _LT_PATH_MAGIC +# -------------- +# find a file program which can recognize a shared library +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# _LT_PATH_MAGIC + + +# LT_PATH_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD + + +# LT_PATH_NM +# ---------- +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} +fi]) +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi + AC_SUBST([DUMPBIN]) + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl + +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM + +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) + +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + + +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M + +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) + + +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl + +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test "$GCC" = yes; then + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac + + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI + + +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl + +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT@&t@_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) +]) # _LT_CMD_GLOBAL_SYMBOLS + + +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= + +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; + + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC + + +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + + if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GCC" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac + ;; + + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + ;; + esac + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS="$save_LDFLAGS"]) + if test "$lt_cv_irix_exported_symbol" = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *nto* | *qnx*) + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld + +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) + +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + ;; + esac + fi + ;; +esac + +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting ${shlibpath_var} if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS + + +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# Ensure that the configuration variables for a C compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC="$CC" +AC_LANG_PUSH(C) + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + + # Report which library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_CONFIG($1) +fi +AC_LANG_POP +CC="$lt_save_CC" +])# _LT_LANG_C_CONFIG + + +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi + + if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + LT_PATH_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + gnu*) + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + + _LT_TAGVAR(GCC, $1)="$GXX" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes + +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + + +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= + +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF +]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + fi + + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + if test "$pre_test_object_deps_done" = no; then + case ${prev} in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)="${prev}${p}" + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi + prev= + ;; + + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)="$p" + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)="$p" + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling $1 test program" +fi + +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; + +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac +]) + +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS + + +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a Fortran 77 compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_F77" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} + CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$G77" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" +fi # test "$_lt_disable_F77" != yes + +AC_LANG_POP +])# _LT_LANG_F77_CONFIG + + +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for a Fortran compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} + +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_FC" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} + CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test "$_lt_disable_FC" != yes + +AC_LANG_POP +])# _LT_LANG_FC_CONFIG + + +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE + +# Source file extension for Java test sources. +ac_ext=java + +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" + +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG + + +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +CFLAGS= +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG + + +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) + + +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) +]) + + +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) + +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED + +m4_ifndef([AC_PROG_SED], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ + +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef + +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) + + +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +AC_MSG_RESULT([$xsi_shell]) +_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) + +AC_MSG_CHECKING([whether the shell understands "+="]) +lt_shell_append=no +( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +AC_MSG_RESULT([$lt_shell_append]) +_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES + + +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) + + +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- +# Replace existing portable implementations of several shell functions with +# equivalent extended shell implementations where those features are available.. +m4_defun([_LT_PROG_REPLACE_SHELLFNS], +[if test x"$xsi_shell" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi + +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) + +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 new file mode 100644 index 0000000..5d9acd8 --- /dev/null +++ b/m4/ltoptions.m4 @@ -0,0 +1,384 @@ +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 7 ltoptions.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) + + +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + + +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option `$2'])])[]dnl +]) + + +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + + +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) + + +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + ]) +])# _LT_SET_OPTIONS + + +## --------------------------------- ## +## Macros to handle LT_INIT options. ## +## --------------------------------- ## + +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + + +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE + + +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) + +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `dlopen' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + + +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac + +test -z "$AS" && AS=as +_LT_DECL([], [AS], [1], [Assembler program])dnl + +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl + +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl +])# win32-dll + +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `win32-dll' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + + +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the `shared' and +# `disable-shared' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED + +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) + +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) + +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + + +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the `static' and +# `disable-static' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) + + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC + +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) + +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) + +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) + + + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the `fast-install' +# and `disable-fast-install' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) + +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `fast-install' option into LT_INIT's first parameter.]) +]) + +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `disable-fast-install' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + + +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# LT_INIT options. +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [pic_mode=default]) + +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC + +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `pic-only' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + +## ----------------- ## +## LTDL_INIT Options ## +## ----------------- ## + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 new file mode 100644 index 0000000..9000a05 --- /dev/null +++ b/m4/ltsugar.m4 @@ -0,0 +1,123 @@ +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 6 ltsugar.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + + +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + + +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59 which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) + + + +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) + + +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) + + +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) + + +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) + + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +]) diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 new file mode 100644 index 0000000..07a8602 --- /dev/null +++ b/m4/ltversion.m4 @@ -0,0 +1,23 @@ +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# @configure_input@ + +# serial 3337 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.4.2' +macro_revision='1.3337' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 new file mode 100644 index 0000000..c573da9 --- /dev/null +++ b/m4/lt~obsolete.m4 @@ -0,0 +1,98 @@ +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 5 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/missing b/missing new file mode 100755 index 0000000..db98974 --- /dev/null +++ b/missing @@ -0,0 +1,215 @@ +#! /bin/sh +# Common wrapper for a few potentially missing GNU programs. + +scriptversion=2013-10-28.13; # UTC + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# 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, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try '$0 --help' for more information" + exit 1 +fi + +case $1 in + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + +Supported PROGRAM values: + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man + +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. + +Send bug reports to ." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + +esac + +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: From 02140d89c53d30e6ac8ca70fb06487ce7c525806 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Thu, 4 Feb 2016 07:30:14 +0000 Subject: [PATCH 173/198] Fixed invalid free memory 1417 ==1438== 1418 ==1438== More than 100 errors detected. Subsequent errors 1419 ==1438== will still be recorded, but in less detail than before. 1420 ==1438== Invalid free() / delete / delete[] / realloc() 1421 ==1438== at 0x4C27430: free (vg_replace_malloc.c:446) 1422 ==1438== by 0x4202DC: AlertJSONCleanup (spo_alert_json.c:1018) 1423 ==1438== by 0x403EF2: Barnyard2Cleanup (barnyard2.c:1122) 1424 ==1438== by 0x40428C: SignalCheck (barnyard2.c:1405) 1425 ==1438== by 0x405E1F: Barnyard2Main (barnyard2.c:395) 1426 ==1438== by 0x6185D5C: (below main) (in /lib64/libc-2.12.so) 1427 ==1438== Address 0x79cc8e0 is 0 bytes inside a block of size 24 free'd 1428 ==1438== at 0x4C27430: free (vg_replace_malloc.c:446) 1429 ==1438== by 0x4202DC: AlertJSONCleanup (spo_alert_json.c:1018) 1430 ==1438== by 0x403EF2: Barnyard2Cleanup (barnyard2.c:1122) 1431 ==1438== by 0x40428C: SignalCheck (barnyard2.c:1405) 1432 ==1438== by 0x405E1F: Barnyard2Main (barnyard2.c:395) 1433 ==1438== by 0x6185D5C: (below main) (in /lib64/libc-2.12.so) --- src/output-plugins/spo_alert_json.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 3e9d0f8..417866a 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1013,8 +1013,10 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) freeNumberStrAssocList(data->services); freeNumberStrAssocList(data->protocols); freeNumberStrAssocList(data->vlans); - while((template_element = output_template_first(&data->output_template))) - { + + while(!TAILQ_EMPTY(&data->output_template)) { + template_element = output_template_first(&data->output_template); + TAILQ_REMOVE(&data->output_template, template_element, qentry); free(template_element); } From 4469f7a1192ac7fc95211d263c6c892076bf8b96 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Thu, 4 Feb 2016 12:40:58 +0000 Subject: [PATCH 174/198] Bug: leak memory. Do not free the eth_vendors_db elemnt ==7242== 1 bytes in 1 blocks are still reachable in loss record 1 of 33 ==7242== at 0x4C27A2E: malloc (vg_replace_malloc.c:270) ==7242== by 0x61E7EC1: strdup (in /lib64/libc-2.12.so) ==7242== by 0x5253D3D: rd_memctx_init (in /opt/rb/lib/librd.so) ==7242== by 0x5F65C9B: rb_new_mac_vendor_db (in /opt/rb/lib/librb_mac_vendors.so.0) ==7242== by 0x421EA7: AlertJSONParseArgs (spo_alert_json.c:728) ==7242== by 0x42252A: AlertJSONInit (spo_alert_json.c:360) ==7242== by 0x413969: ConfigureOutputPlugins (parser.c:609) ==7242== by 0x405654: Barnyard2Init (barnyard2.c:2092) ==7242== by 0x405DCA: Barnyard2Main (barnyard2.c:325) ==7242== by 0x6185D5C: (below main) (in /lib64/libc-2.12.so) --- src/output-plugins/spo_alert_json.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 417866a..c34a81b 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1007,6 +1007,10 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) } #endif // HAVE_GEOIP +#ifdef HAVE_RB_MAC_VENDORS + if(data->eth_vendors_db) + rb_destroy_mac_vendor_db(data->eth_vendors_db); +#endif free(data->jsonargs); freeNumberStrAssocList(data->hosts); freeNumberStrAssocList(data->nets); From cb2f2bd85b8b6d65e212a63d40dfee22d16715fd Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Thu, 4 Feb 2016 16:52:52 +0000 Subject: [PATCH 175/198] Release memory in kafka --- src/output-plugins/spo_alert_json.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index c34a81b..8604f81 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -978,13 +978,12 @@ static void AlertJSONCleanup(int signal, void *arg, const char* msg) if(data->kafka.rkt) { - // @TODO - // rdkafka_topic_destroy(data->kafka.rkt); + rd_kafka_topic_destroy(data->kafka.rkt); } rd_kafka_destroy(data->kafka.rk); - // @TODO - // rd_kafka_wait_destroyed(); + while(rd_kafka_wait_destroyed(1000) == -1); + } #endif From 76bffcefc8de1b02d554235d1716bddf7008d807 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Mon, 15 Feb 2016 12:03:45 +0000 Subject: [PATCH 176/198] extradata: deleted "<" and ">" caracteres in email_sender element Exmaple: "email_sender": "ejimenez@redborder.net", Old format: "email_sender": "", --- src/output-plugins/spo_alert_json.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 8604f81..4ead12a 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1513,7 +1513,10 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, { str = (char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - printbuf_memappend_fast(printbuf, str, len); + if (len >1 && str[0]=='<' && str[len-1] == '>') + printbuf_memappend_fast(printbuf, str+1, len-2); + else + printbuf_memappend_fast(printbuf, str, len); } break; case EMAIL_DESTINATIONS: From 4a1ec7511498d2acbb11953cd2a8e84a8fcaea67 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Mon, 15 Feb 2016 15:00:40 +0000 Subject: [PATCH 177/198] extradata: email_destination in an array Example: "email_destinations":"[\"rcpt1@redborder.net\",\"rcpt2@redborder.net\",\"rcpt3@redborder.net\"]" "email_destinations":"[\"malware@redborder.net>\"]" --- src/output-plugins/spo_alert_json.c | 41 ++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 4ead12a..9107661 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1522,9 +1522,48 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, case EMAIL_DESTINATIONS: if (event_info == EVENT_INFO_FILE_RCPTTO) { + const char delimiter[6] = ">,<"; + int with_comma = 0; + char *substring; + int cursor = 0; + int str_len = 0; + int size_email = 0; + str = (char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - printbuf_memappend_fast(printbuf, str, len); + + printbuf_memappend_fast(printbuf, "[", 1); + + if (len >1 && str[0]=='<') { + substring = strstr(str, delimiter); + cursor = 1; + } + + str_len = strlen(str); + + while (substring != NULL) { + if (with_comma != 0) + printbuf_memappend_fast(printbuf, ",", strlen(",")); + + size_email = str_len - strlen(substring) - cursor; + printbuf_memappend_fast(printbuf, (const char *)"\\\"", strlen("\\\"")); + printbuf_memappend_fast(printbuf, (const char *)str + cursor, size_email); + printbuf_memappend_fast(printbuf, (const char *)"\\\"", strlen("\\\"")); + cursor = cursor + size_email + 3; + with_comma = 1; + substring = strstr(str + cursor, delimiter); + } + + if ((cursor < str_len) && str[cursor -1]=='<' && str[str_len - 1] == '>') { + size_email = str_len - cursor; + if (with_comma != 0) + printbuf_memappend_fast(printbuf, ",", strlen(",")); + printbuf_memappend_fast(printbuf, (const char *)"\\\"", strlen("\\\"")); + printbuf_memappend_fast(printbuf, (const char *)str + cursor, size_email); + printbuf_memappend_fast(printbuf, (const char *)"\\\"", strlen("\\\"")); + } + + printbuf_memappend_fast(printbuf, "]", 1); } break; From 3fe7c2eabe6603da09f4d6799cce5d11731dc89a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Tue, 16 Feb 2016 16:39:24 +0000 Subject: [PATCH 178/198] Created printMail function --- src/output-plugins/spo_alert_json.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 9107661..5ff9fd6 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1457,6 +1457,22 @@ static char *extract_AS(AlertJSONData *jsonData,const sfip_t *ip) #endif #ifdef RB_EXTRADATA +/* + * Function: printMail(const char *, struct printbuf *) + * + * Purpose: Write an Unified2 extradata mail in printbuf + * + * Arguments: mail => mail + * printbuf => printed mail with no <,> + * Returns: printed characters. + */ +static void printMail(const char *mail,int len, struct printbuf *printbuf) { + if (len >1 && mail[0]=='<' && mail[len-1] == '>') + printbuf_memappend_fast(printbuf, mail+1, len-2); + else + printbuf_memappend_fast(printbuf, mail, len); +} + static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, struct printbuf *printbuf, Unified2ExtraData *U2ExtraData) { @@ -1511,12 +1527,9 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, case EMAIL_SENDER: if (event_info == EVENT_INFO_FILE_MAILFROM) { - str = (char *)(U2ExtraData+1); + str = (U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - if (len >1 && str[0]=='<' && str[len-1] == '>') - printbuf_memappend_fast(printbuf, str+1, len-2); - else - printbuf_memappend_fast(printbuf, str, len); + printMail(str,len,printbuf); } break; case EMAIL_DESTINATIONS: From abd4f8e3514f93f099ec5c037d7a79e27307e2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Tue, 16 Feb 2016 17:13:17 +0000 Subject: [PATCH 179/198] Cleaning EMAIL_DESTINATIONS extradata print case --- src/output-plugins/spo_alert_json.c | 55 ++++++++++++----------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 5ff9fd6..a25213a 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1527,7 +1527,7 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, case EMAIL_SENDER: if (event_info == EVENT_INFO_FILE_MAILFROM) { - str = (U2ExtraData+1); + str = (char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); printMail(str,len,printbuf); } @@ -1535,45 +1535,34 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, case EMAIL_DESTINATIONS: if (event_info == EVENT_INFO_FILE_RCPTTO) { - const char delimiter[6] = ">,<"; - int with_comma = 0; - char *substring; - int cursor = 0; - int str_len = 0; - int size_email = 0; - - str = (char *)(U2ExtraData+1); + str = (const char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - printbuf_memappend_fast(printbuf, "[", 1); + /* + * str is: + * ,, + * need it in json way + * ["rcpt1@redborder.net","rcpt2@redborder.net","rcpt3@redborder.net"] + */ - if (len >1 && str[0]=='<') { - substring = strstr(str, delimiter); - cursor = 1; - } + printbuf_memappend_fast(printbuf, "[", 1); - str_len = strlen(str); + const char *cursor = str; + while(cursor) + { + const char *end = memchr(cursor,',',len); + if (cursor != str) + { + printbuf_memappend_fast_str(printbuf, ","); + } - while (substring != NULL) { - if (with_comma != 0) - printbuf_memappend_fast(printbuf, ",", strlen(",")); + int mail_len = end ? end - cursor : len - (cursor - str); - size_email = str_len - strlen(substring) - cursor; - printbuf_memappend_fast(printbuf, (const char *)"\\\"", strlen("\\\"")); - printbuf_memappend_fast(printbuf, (const char *)str + cursor, size_email); - printbuf_memappend_fast(printbuf, (const char *)"\\\"", strlen("\\\"")); - cursor = cursor + size_email + 3; - with_comma = 1; - substring = strstr(str + cursor, delimiter); - } + printbuf_memappend_fast_str(printbuf, "\\\""); + printMail(cursor, mail_len, printbuf); + printbuf_memappend_fast_str(printbuf, "\\\""); - if ((cursor < str_len) && str[cursor -1]=='<' && str[str_len - 1] == '>') { - size_email = str_len - cursor; - if (with_comma != 0) - printbuf_memappend_fast(printbuf, ",", strlen(",")); - printbuf_memappend_fast(printbuf, (const char *)"\\\"", strlen("\\\"")); - printbuf_memappend_fast(printbuf, (const char *)str + cursor, size_email); - printbuf_memappend_fast(printbuf, (const char *)"\\\"", strlen("\\\"")); + cursor = end ? end + 1 : NULL; } printbuf_memappend_fast(printbuf, "]", 1); From a859ac84158b748ffbac334ddd526dca9016cc21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Tue, 16 Feb 2016 17:18:20 +0000 Subject: [PATCH 180/198] Created printMultipleMails function --- src/output-plugins/spo_alert_json.c | 68 ++++++++++++++++------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index a25213a..c54b743 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1458,11 +1458,12 @@ static char *extract_AS(AlertJSONData *jsonData,const sfip_t *ip) #ifdef RB_EXTRADATA /* - * Function: printMail(const char *, struct printbuf *) + * Function: printMail(const char *, int, struct printbuf *) * * Purpose: Write an Unified2 extradata mail in printbuf * * Arguments: mail => mail + * len => length of mail * printbuf => printed mail with no <,> * Returns: printed characters. */ @@ -1473,6 +1474,41 @@ static void printMail(const char *mail,int len, struct printbuf *printbuf) { printbuf_memappend_fast(printbuf, mail, len); } +/* + * Function: printMultipleMails(const char *, struct printbuf *) + * + * Purpose: Write an Unified2 extradata mails in printbuf + * + * Arguments: mails => mail "," + * len => length of mails string + * printbuf => printed mail in ["test@test.com","test2@test.com"] + * Returns: printed characters. + */ +static void printMultipleMails(const char *mails,int len, struct printbuf *printbuf) +{ + printbuf_memappend_fast(printbuf, "[", 1); + + const char *cursor = mails; + while(cursor) + { + const char *end = memchr(cursor,',',len); + if (cursor != mails) + { + printbuf_memappend_fast_str(printbuf, ","); + } + + int mail_len = end ? end - cursor : len - (cursor - mails); + + printbuf_memappend_fast_str(printbuf, "\\\""); + printMail(cursor, mail_len, printbuf); + printbuf_memappend_fast_str(printbuf, "\\\""); + + cursor = end ? end + 1 : NULL; + } + + printbuf_memappend_fast(printbuf, "]", 1); +} + static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, struct printbuf *printbuf, Unified2ExtraData *U2ExtraData) { @@ -1537,35 +1573,7 @@ static int printElementExtraDataBlob(AlertJSONTemplateElement *templateElement, { str = (const char *)(U2ExtraData+1); len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - - /* - * str is: - * ,, - * need it in json way - * ["rcpt1@redborder.net","rcpt2@redborder.net","rcpt3@redborder.net"] - */ - - printbuf_memappend_fast(printbuf, "[", 1); - - const char *cursor = str; - while(cursor) - { - const char *end = memchr(cursor,',',len); - if (cursor != str) - { - printbuf_memappend_fast_str(printbuf, ","); - } - - int mail_len = end ? end - cursor : len - (cursor - str); - - printbuf_memappend_fast_str(printbuf, "\\\""); - printMail(cursor, mail_len, printbuf); - printbuf_memappend_fast_str(printbuf, "\\\""); - - cursor = end ? end + 1 : NULL; - } - - printbuf_memappend_fast(printbuf, "]", 1); + printMultipleMails(str,len,printbuf); } break; From 888586acb1d59f94b878a7c46d7f9a8c520aa2a3 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Mon, 22 Feb 2016 15:45:28 +0000 Subject: [PATCH 181/198] Fix in Alarm Control for spoolerFireLastEvent() --- src/spooler.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/spooler.c b/src/spooler.c index 0423620..2ab4645 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -537,7 +537,6 @@ int ProcessContinuous(const char *dirpath, const char *filebase, spoolerFireLastEvent(spooler); AlarmClear(); } - else #endif /* act according to current spooler state */ switch(spooler->state) From 05ac8f12cd18f71261a3a3478ec930cddcc39c2d Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Mon, 22 Feb 2016 16:12:01 +0000 Subject: [PATCH 182/198] Added spoolerPrint*() functions for debug purposes --- src/spooler.c | 375 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 375 insertions(+) diff --git a/src/spooler.c b/src/spooler.c index 2ab4645..926961f 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -69,6 +69,11 @@ static int spoolerExtraDataCachePush(Spooler *, uint32_t, void *, EventRecordNod static void spoolerFireLastEvent(Spooler *); static int spoolerCallOutputPluginsByERN (EventRecordNode *); static int spoolerExtraDataCacheClean(EventRecordNode *ern); +static void spoolerPrint(Spooler *, int); +static void spoolerPrintRecord(Spooler *, int); +static void spoolerPrintERN(EventRecordNode *, int); +static void spoolerPrintEDRN(ExtraDataRecordNode *, int); +static void spoolerPrintU2ED (Unified2ExtraData *, const char *); #endif /* Find the next spool file timestamp extension with a value equal to or @@ -1562,4 +1567,374 @@ static int spoolerExtraDataCacheClean(EventRecordNode *ern) return 0; } + +/* + Print a formated output of spooler + printType: + 0: No print. + 1: Print. + 2: Full print. +*/ +static void spoolerPrint(Spooler *spooler, int printType) +{ + EventRecordNode *ern; + + if (spooler == NULL) + { + LogMessage("spoolerPrint(): spooler is NULL\n"); + return; + } + + switch (printType) + { + case 0: + LogMessage ("spoolerPrint(): No print\n"); + break; + case 1: + case 2: + LogMessage ("spoolerPrint(): Print\n"); + LogMessage ("fd (file descriptor): %d\n", spooler->fd); + LogMessage ("filepath: %s\n", spooler->filepath); + LogMessage ("timestamp: %u\n", (unsigned int) spooler->timestamp); + LogMessage ("state: %u\n", spooler->state); + LogMessage ("offset: %u\n", spooler->offset); + LogMessage ("record_idx: %u\n", spooler->record_idx); + LogMessage ("magic: %u\n", spooler->magic); + LogMessage ("header (header of input file): 0x%lu\n", (long unsigned int) spooler->header); + + // Print current record and related ERN if exists + LogMessage ("[Current Record]\n"); + spoolerPrintRecord(spooler, printType); + + // Print every ERN + LogMessage ("events_cached: %u\n", spooler->events_cached); + if (printType == 2) + { + LogMessage ("[ERN from spooler->event_cache]\n"); + TAILQ_FOREACH(ern, &spooler->event_cache, entry) + { + LogMessage ("ern->data->event_id: %u\n", ntohl(((Unified2EventCommon *)ern->data)->event_id)); + spoolerPrintERN(ern, printType); + } + } + + LogMessage ("packets_cached: %u\n", spooler->packets_cached); + + break; + } + LogMessage ("\n"); +} + +static void spoolerPrintRecord(Spooler *spooler, int printType) +{ + uint32_t type; + uint32_t event_id = -1; + EventRecordNode *ern; + + if (spooler->record.header != NULL) + { + type = ntohl(((Unified2RecordHeader *)spooler->record.header)->type); + switch (type) + { + case UNIFIED2_PACKET: + LogMessage (" spooler->record.header->type = %u (UNIFIED2_PACKET)\n", type); + break; + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + LogMessage (" spooler->record.header->type = %u (UNIFIED2_IDS_EVENT*)\n", type); + break; + case UNIFIED2_EXTRA_DATA: + LogMessage (" spooler->record.header->type = %u (UNIFIED2_EXTRA_DATA)\n", type); + break; + default: + LogMessage (" spooler->record.header->type = %u (Unknown)\n", type); + return; // revisar si el return es lo mejor + } + } + else + LogMessage (" spooler->record.header is NULL\n"); + + if (spooler->record.data != NULL) + { + switch (type) + { + case UNIFIED2_PACKET: + case UNIFIED2_IDS_EVENT: + case UNIFIED2_IDS_EVENT_IPV6: + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + event_id = ntohl(((Unified2EventCommon *)spooler->record.data)->event_id); + LogMessage (" spooler->record.data->event_id = %u\n", event_id); + break; + case UNIFIED2_EXTRA_DATA: + event_id = ntohl(((Unified2ExtraData *)(((Unified2ExtraDataHdr *)spooler->record.data)+1))->event_id); + LogMessage (" spooler->record.data->event_id = %u\n", event_id); + spoolerPrintU2ED((Unified2ExtraData *)(((Unified2ExtraDataHdr *)spooler->record.data)+1), "record.data"); + break; + default: + event_id = 0; + LogMessage (" spooler->record.data->event_id could not be catched\n"); + } + } + else + LogMessage (" spooler->record.data is NULL\n"); + + if (spooler->record.pkt != NULL) + { + LogMessage (" spooler->record.pkt: ["); + uint16_t i; + uint16_t max = 16; // packet payload bytes to print + max = spooler->record.pkt->dsize>max?max:spooler->record.pkt->dsize; + if(spooler->record.pkt && spooler->record.pkt->dsize>0){ + for(i=0;irecord.pkt->data[i]); + }else{ + LogMessage ("NULL"); + } + LogMessage ("]\n"); + } + else + LogMessage (" spooler->record.pkt is NULL\n"); + + + if (event_id > 0) + { + ern = spoolerEventCacheGetByEventID(spooler, event_id); + LogMessage ("[ERN of this Record]\n"); + spoolerPrintERN(ern, printType); + } +} + +static void spoolerPrintERN(EventRecordNode *ern, int printType) +{ + ExtraDataRecordCache *edrc; + ExtraDataRecordNode *edrn, *edrn_next; + Packet *p = NULL; + + if (ern != NULL) + { + switch (ern->type) + { + case UNIFIED2_IDS_EVENT: + LogMessage (" ern->type = %u (UNIFIED2_IDS_EVENT)\n", ern->type); + break; + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + LogMessage (" ern->type = %u (UNIFIED2_IDS_EVENT_MPLS/VLAN)\n", ern->type); + break; + case UNIFIED2_IDS_EVENT_IPV6: + LogMessage (" ern->type = %u (UNIFIED2_IDS_EVENT_IPV6)\n", ern->type); + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + LogMessage (" ern->type = %u (UNIFIED2_IDS_EVENT_IPV6_MPLS/VLAN)\n", ern->type); + break; + default: + LogMessage(" ern->type = %u (Unknown)\n", ern->type); + break; + } + + if (ern->data != NULL) + { + switch (ern->type) + { + case UNIFIED2_IDS_EVENT: + p = (Packet *) ((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet; + edrc = &((Unified2IDSEvent_legacy_WithPED *)(ern->data))->extra_data_cache; + break; + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + p = (Packet *) ((Unified2IDSEvent_WithPED *)ern->data)->packet; + edrc = &((Unified2IDSEvent_WithPED *)(ern->data))->extra_data_cache; + break; + case UNIFIED2_IDS_EVENT_IPV6: + p = (Packet *) ((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet; + edrc = &((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data))->extra_data_cache; + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + p = (Packet *) ((Unified2IDSEventIPv6_WithPED *)ern->data)->packet; + edrc = &((Unified2IDSEventIPv6_WithPED *)(ern->data))->extra_data_cache; + break; + default: + p = NULL; + edrc = NULL; + break; + } + + if (p != NULL) + { + LogMessage (" ern->data->packet: ["); + uint16_t i; + uint16_t max = 16; // packet payload bytes to print + max = p->dsize>max?max:p->dsize; + if(p && p->dsize>0){ + for(i=0;idata[i]); + }else{ + LogMessage ("NULL"); + } + LogMessage ("]\n"); + } + else + LogMessage (" ern->data->packet is NULL\n"); + + if (edrc != NULL) + { + if (!TAILQ_EMPTY(edrc)) + { + LogMessage (" [EDRN from ern->data->extra_data_cache]\n"); + TAILQ_FOREACH_SAFE(edrn, edrn_next, edrc, entry) + { + spoolerPrintEDRN(edrn, printType); + } + } + } + else + LogMessage (" ern->data->extra_data_cache is NULL\n"); + } + else + LogMessage (" ern->data is NULL\n"); + + LogMessage(" ern->used = %u\n", ern->used); + } + else + LogMessage (" ern is NULL\n"); +} + +static void spoolerPrintEDRN(ExtraDataRecordNode *edrn, int printType) +{ + if (edrn != NULL) + { + switch (edrn->type) + { + case UNIFIED2_IDS_EVENT: + LogMessage (" WRONG! edrn->type = %u (UNIFIED2_IDS_EVENT)\n", edrn->type); + break; + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + LogMessage (" WRONG! edrn->type = %u (UNIFIED2_IDS_EVENT_MPLS/VLAN)\n", edrn->type); + break; + case UNIFIED2_IDS_EVENT_IPV6: + LogMessage (" WRONG! edrn->type = %u (UNIFIED2_IDS_EVENT_IPV6)\n", edrn->type); + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + LogMessage (" WRONG! edrn->type = %u (UNIFIED2_IDS_EVENT_IPV6_MPLS/VLAN)\n", edrn->type); + break; + case UNIFIED2_EXTRA_DATA: + LogMessage (" edrn->type = %u (UNIFIED2_EXTRA_DATA)\n", edrn->type); + break; + default: + LogMessage(" edrn->type = %u (Unknown)\n", edrn->type); + break; + } + + if (edrn->data != NULL) + spoolerPrintU2ED((Unified2ExtraData *)(((Unified2ExtraDataHdr *)edrn->data)+1), "edrn->data"); + else + LogMessage (" edrn->data is NULL\n"); + + LogMessage(" edrn->used = %u\n", edrn->used); + } + else + LogMessage (" edrn is NULL\n"); +} + +static void spoolerPrintU2ED (Unified2ExtraData *U2ExtraData, const char *source) +{ + uint32_t type; + uint32_t data_type; + uint32_t blob_length; + const uint8_t *sha_str; + const char *str; + int len; + uint16_t smb_uid; + + type = ntohl(U2ExtraData->type); // data->type + data_type = ntohl(U2ExtraData->data_type); // data->data_type + blob_length = ntohl(U2ExtraData->blob_length); // data->blob_length + + switch (type) + { + case EVENT_INFO_FILE_SHA256: + LogMessage (" %s->type: %u (EVENT_INFO_FILE_SHA256)\n", source, type); + LogMessage (" %s->sha256: [", source); + sha_str = (uint8_t *)(U2ExtraData+1); + len = (int) (blob_length - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + uint16_t i; + if(sha_str && len>0) + for(i=0; itype: %u (EVENT_INFO_FILE_SIZE)\n", source, type); + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + LogMessage(" %s->file_size: %s\n", source, str); + break; + case EVENT_INFO_FILE_NAME: + LogMessage (" %s->type: %u (EVENT_INFO_FILE_NAME)\n", source, type); + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + LogMessage(" %s->file_name: %s\n", source, str); + break; + case EVENT_INFO_FILE_HOSTNAME: + LogMessage (" %s->type: %u (EVENT_INFO_FILE_HOSTNAME)\n", source, type); + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + LogMessage(" %s->file_hostname: %s\n", source, str); + break; + case EVENT_INFO_FILE_MAILFROM: + LogMessage (" %s->type: %u (EVENT_INFO_FILE_MAILFROM)\n", source, type); + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + LogMessage(" %s->email_sender: %s\n", source, str); + break; + case EVENT_INFO_FILE_RCPTTO: + LogMessage (" %s->type: %u (EVENT_INFO_FILE_RCPTTO)\n", source, type); + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + LogMessage(" %s->email_destinations: %s\n", source, str); + break; + case EVENT_INFO_FILE_EMAIL_HDRS: + LogMessage (" %s->type: %u (EVENT_INFO_FILE_EMAIL_HDRS)\n", source, type); + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + LogMessage(" %s->email_headers: %s\n", source, str); + break; + case EVENT_INFO_FTP_USER: + LogMessage (" %s->type: %u (EVENT_INFO_FTP_USER)\n", source, type); + str = (char *)(U2ExtraData+1); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + LogMessage(" %s->ftp_user: %s\n", source, str); + break; + case EVENT_INFO_SMB_UID: + LogMessage (" %s->type: %u (EVENT_INFO_SMB_UID)\n", source, type); + smb_uid = ntohs(*(uint16_t *)(U2ExtraData+1)); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + LogMessage (" %s->smb_uid: %u", source, smb_uid); + break; + case EVENT_INFO_SMB_IS_UPLOAD: + LogMessage (" %s->type: %u (EVENT_INFO_SMB_IS_UPLOAD)\n", source, type); + smb_uid = ntohs(*(uint16_t *)(U2ExtraData+1)); + len = (int) (ntohl(U2ExtraData->blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); + if (smb_uid == 0) + LogMessage (" %s->smb_upload: false", source); + else + LogMessage (" %s->smb_upload: true", source); + break; + default: + break; + } +} #endif From 9f5a4b3374a815c6a2cecfdfc215eafb72b909ac Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Mon, 22 Feb 2016 16:27:36 +0000 Subject: [PATCH 183/198] Protection added when reading from spooler --- src/spooler.c | 134 ++++++++++++++++++++++++++++---------------------- 1 file changed, 74 insertions(+), 60 deletions(-) diff --git a/src/spooler.c b/src/spooler.c index 926961f..81e8860 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -743,58 +743,67 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) /* check if it's packet */ if (type == UNIFIED2_PACKET) { - /* convert event id once */ - uint32_t event_id = ntohl(((Unified2Packet *)spooler->record.data)->event_id); +#ifdef RB_EXTRADATA + if (spooler->record.data != NULL) + { + /* convert event id once */ + uint32_t event_id = ntohl(((Unified2Packet *)spooler->record.data)->event_id); - /* check if there is a previously cached event that matches this event id */ - ernCache = spoolerEventCacheGetByEventID(spooler, event_id); + /* check if there is a previously cached event that matches this event id */ + ernCache = spoolerEventCacheGetByEventID(spooler, event_id); -#ifdef RB_EXTRADATA - datalink = ntohl(((Unified2Packet *)spooler->record.data)->linktype); + datalink = ntohl(((Unified2Packet *)spooler->record.data)->linktype); - /* if the packet and cached event share the same id */ - if (ernCache != NULL) - { - /* add the packet into the cached event */ - switch (ernCache->type) + /* if the packet and cached event share the same id */ + if (ernCache != NULL) { - case UNIFIED2_IDS_EVENT: - /* if there is no previous packet */ - if (((Unified2IDSEvent_legacy_WithPED *)ernCache->data)->packet == NULL) - ((Unified2IDSEvent_legacy_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); - /* when != NULL there is a previous packet cached with the event. do nothing here. */ - break; - case UNIFIED2_IDS_EVENT_MPLS: - case UNIFIED2_IDS_EVENT_VLAN: - /* if there is no previous packet */ - if (((Unified2IDSEvent_WithPED *)ernCache->data)->packet == NULL) - ((Unified2IDSEvent_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); - /* when != NULL there is a previous packet cached with the event. do nothing here. */ - break; - case UNIFIED2_IDS_EVENT_IPV6: - /* if there is no previous packet */ - if (((Unified2IDSEventIPv6_legacy_WithPED *)ernCache->data)->packet == NULL) - ((Unified2IDSEventIPv6_legacy_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); - /* when != NULL there is a previous packet cached with the event. do nothing here. */ - break; - case UNIFIED2_IDS_EVENT_IPV6_MPLS: - case UNIFIED2_IDS_EVENT_IPV6_VLAN: - /* if there is no previous packet */ - if (((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet == NULL) - ((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); - /* when != NULL there is a previous packet cached with the event. do nothing here. */ + /* add the packet into the cached event */ + switch (ernCache->type) + { + case UNIFIED2_IDS_EVENT: + /* if there is no previous packet */ + if (((Unified2IDSEvent_legacy_WithPED *)ernCache->data)->packet == NULL) + ((Unified2IDSEvent_legacy_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); + /* when != NULL there is a previous packet cached with the event. do nothing here. */ + break; + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + /* if there is no previous packet */ + if (((Unified2IDSEvent_WithPED *)ernCache->data)->packet == NULL) + ((Unified2IDSEvent_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); + /* when != NULL there is a previous packet cached with the event. do nothing here. */ + break; + case UNIFIED2_IDS_EVENT_IPV6: + /* if there is no previous packet */ + if (((Unified2IDSEventIPv6_legacy_WithPED *)ernCache->data)->packet == NULL) + ((Unified2IDSEventIPv6_legacy_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); + /* when != NULL there is a previous packet cached with the event. do nothing here. */ + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + /* if there is no previous packet */ + if (((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet == NULL) + ((Unified2IDSEventIPv6_WithPED *)ernCache->data)->packet = spoolerAllocateFirstPacket(spooler); + /* when != NULL there is a previous packet cached with the event. do nothing here. */ + break; + default: + LogMessage("WARNING: spoolerProcessRecord(): type inconsistent (%d)\n", ernCache->type); break; - default: - LogMessage("WARNING: spoolerProcessRecord(): type inconsistent (%d)\n", ernCache->type); - break; + } } + //else + //{ + // We are assuming that a packet record will never show up before an event record does + // This hypothetical case should be taken into account after testings + //} } - //else - //{ - // We are assuming that a packet record will never show up before an event record does - // This hypothetical case should be taken into account after testings - //} #else + /* convert event id once */ + uint32_t event_id = ntohl(((Unified2Packet *)spooler->record.data)->event_id); + + /* check if there is a previously cached event that matches this event id */ + ernCache = spoolerEventCacheGetByEventID(spooler, event_id); + /* allocate space for the packet and construct the packet header */ spooler->record.pkt = SnortAlloc(sizeof(Packet)); @@ -917,24 +926,27 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) else if (type == UNIFIED2_EXTRA_DATA) { #ifdef RB_EXTRADATA - /* convert event id once */ - uint32_t event_id = ntohl(((Unified2ExtraData *)(((Unified2ExtraDataHdr *)spooler->record.data)+1))->event_id); + if (spooler->record.data != NULL) + { + /* convert event id once */ + uint32_t event_id = ntohl(((Unified2ExtraData *)(((Unified2ExtraDataHdr *)spooler->record.data)+1))->event_id); - /* check if there is a previously cached event that matches this event id */ - ernCache = spoolerEventCacheGetByEventID(spooler, event_id); + /* check if there is a previously cached event that matches this event id */ + ernCache = spoolerEventCacheGetByEventID(spooler, event_id); - /* if the packet and cached event share the same id */ - if ( ernCache != NULL ) - { - /* include extra data record */ - spoolerExtraDataCachePush(spooler, type, spooler->record.data, ernCache); - spooler->record.data = NULL; + /* if the packet and cached event share the same id */ + if ( ernCache != NULL ) + { + /* include extra data record */ + spoolerExtraDataCachePush(spooler, type, spooler->record.data, ernCache); + spooler->record.data = NULL; + } + //else + //{ + // We are assuming that an extra data record will never show up before an event record does + // This hypothetical case should be taken into account after testings + //} } - //else - //{ - // We are assuming that an extra data record will never show up before an event record does - // This hypothetical case should be taken into account after testings - //} #endif /* waldo operations occur after the output plugins are called */ @@ -1416,6 +1428,8 @@ static int spoolerCallOutputPluginsByERN(EventRecordNode *ern) if (ern == NULL) ret = 0; + else if (ern->data == NULL) + ret = 0; else { switch (ern->type) @@ -1937,4 +1951,4 @@ static void spoolerPrintU2ED (Unified2ExtraData *U2ExtraData, const char *source break; } } -#endif +#endif \ No newline at end of file From bc0e9a7f29dd7ae006f2605617f1cd6be3046f7f Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Tue, 23 Feb 2016 08:59:19 +0000 Subject: [PATCH 184/198] Added spoolerPrint*Packet() functions for debug purposes --- src/spooler.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/src/spooler.c b/src/spooler.c index 81e8860..6611190 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -74,6 +74,8 @@ static void spoolerPrintRecord(Spooler *, int); static void spoolerPrintERN(EventRecordNode *, int); static void spoolerPrintEDRN(ExtraDataRecordNode *, int); static void spoolerPrintU2ED (Unified2ExtraData *, const char *); +static void spoolerPrintRecordPacket(Spooler *); +static void spoolerPrintERNPacket(EventRecordNode *); #endif /* Find the next spool file timestamp extension with a value equal to or @@ -1951,4 +1953,112 @@ static void spoolerPrintU2ED (Unified2ExtraData *U2ExtraData, const char *source break; } } + +static void spoolerPrintRecordPacket(Spooler *spooler) +{ + uint32_t type; + uint32_t event_id = -1; + EventRecordNode *ern; + + if (spooler->record.header != NULL) + { + type = ntohl(((Unified2RecordHeader *)spooler->record.header)->type); + if (type == UNIFIED2_PACKET) + LogMessage (" spooler->record.header->type = %u (UNIFIED2_PACKET)\n", type); + } + else + LogMessage (" spooler->record.header is NULL\n"); + + if (type == UNIFIED2_PACKET) + { + if (spooler->record.data != NULL) + { + event_id = ntohl(((Unified2EventCommon *)spooler->record.data)->event_id); + LogMessage (" spooler->record.data->event_id = %u\n", event_id); + } + else + LogMessage (" spooler->record.data is NULL\n"); + + /* Packets are never allocated in spooler->record.pkt + if (spooler->record.pkt != NULL) + { + LogMessage (" (0x%x) ern->data->packet: (0x%x) [", + spooler->record.pkt, &(spooler->record.pkt->data[0])); + uint16_t i; + uint16_t max = 16; // packet payload bytes to print + max = spooler->record.pkt->dsize>max?max:spooler->record.pkt->dsize; + if(spooler->record.pkt && spooler->record.pkt->dsize>0){ + for(i=0;irecord.pkt->data[i]); + }else{ + LogMessage ("NULL"); + } + LogMessage ("]\n"); + } + else + LogMessage (" spooler->record.pkt is NULL\n"); + //*/ + + if (event_id > 0) + { + ern = spoolerEventCacheGetByEventID(spooler, event_id); + spoolerPrintERNPacket(ern); + } + } +} + +static void spoolerPrintERNPacket(EventRecordNode *ern) +{ + Packet *p = NULL; + + if (ern != NULL) + { + if (ern->data != NULL) + { + switch (ern->type) + { + case UNIFIED2_IDS_EVENT: + p = (Packet *) ((Unified2IDSEvent_legacy_WithPED *)ern->data)->packet; + break; + case UNIFIED2_IDS_EVENT_MPLS: + case UNIFIED2_IDS_EVENT_VLAN: + p = (Packet *) ((Unified2IDSEvent_WithPED *)ern->data)->packet; + break; + case UNIFIED2_IDS_EVENT_IPV6: + p = (Packet *) ((Unified2IDSEventIPv6_legacy_WithPED *)ern->data)->packet; + break; + case UNIFIED2_IDS_EVENT_IPV6_MPLS: + case UNIFIED2_IDS_EVENT_IPV6_VLAN: + p = (Packet *) ((Unified2IDSEventIPv6_WithPED *)ern->data)->packet; + break; + default: + p = NULL; + break; + } + + if (p != NULL) + { + LogMessage (" (0x%x) ern->data->packet: (0x%x) [", p, &(p->data[0])); + uint16_t i; + uint16_t max = 16; // packet payload bytes to print + max = p->dsize>max?max:p->dsize; + if(p && p->dsize>0){ + for(i=0;idata[i]); + }else{ + LogMessage ("NULL"); + } + LogMessage ("]\n"); + } + else + LogMessage (" ern->data->packet is NULL\n"); + } + else + LogMessage (" ern->data is NULL\n"); + + //LogMessage(" ern->used = %u\n", ern->used); + } + else + LogMessage (" ern is NULL\n"); +} #endif \ No newline at end of file From 40d8d2695ede44ddd3d150707667481747adb321 Mon Sep 17 00:00:00 2001 From: Pablo Cantos Date: Tue, 23 Feb 2016 10:30:52 +0000 Subject: [PATCH 185/198] Some few lines of code fixed --- src/spooler.c | 43 +++++++++++++++++++++++++------------------ src/unified2.h | 18 +++++++----------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/spooler.c b/src/spooler.c index 6611190..8e6c7cd 100644 --- a/src/spooler.c +++ b/src/spooler.c @@ -754,8 +754,6 @@ static void spoolerProcessRecord(Spooler *spooler, int fire_output) /* check if there is a previously cached event that matches this event id */ ernCache = spoolerEventCacheGetByEventID(spooler, event_id); - datalink = ntohl(((Unified2Packet *)spooler->record.data)->linktype); - /* if the packet and cached event share the same id */ if (ernCache != NULL) { @@ -1051,7 +1049,7 @@ static int spoolerEventCacheClean(Spooler *spooler) { EventRecordNode *ernCurrent = NULL; EventRecordNode *ernPrev = NULL; - + if (spooler == NULL || TAILQ_EMPTY(&spooler->event_cache) ) return 1; @@ -1361,7 +1359,7 @@ static int spoolerExtraDataCachePush(Spooler *spooler, uint32_t type, void *data { ExtraDataRecordNode *edrnNode; ExtraDataRecordCache *edrc; -edrc = &(((Unified2IDSEvent_WithPED *)(ern->data)))->extra_data_cache; + DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Including extra data with cached event %lu\n",ntohl(((Unified2EventCommon *)data)->event_id));); /* allocate memory */ @@ -1390,13 +1388,13 @@ edrc = &(((Unified2IDSEvent_WithPED *)(ern->data)))->extra_data_cache; edrc = &((Unified2IDSEventIPv6_WithPED *)(ern->data))->extra_data_cache; break; default: + edrc = NULL; LogMessage("WARNING: spoolerExtraDataCachePush(): type inconsistent (%d)\n", ern->type); break; } - TAILQ_INSERT_HEAD(edrc, edrnNode, entry); - //((Unified2IDSEvent_WithExtra *)data)->extra_data_cached++; - //DEBUG_WRAP(DebugMessage(DEBUG_SPOOLER,"Cached extra data record: %d\n", ((Unified2IDSEvent_WithExtra *)data)->extra_data_cached);); + if (edrc != NULL) + TAILQ_INSERT_HEAD(edrc, edrnNode, entry); return 0; } @@ -1520,7 +1518,6 @@ static int spoolerExtraDataCacheClean(EventRecordNode *ern) ExtraDataRecordNode *edrn_next = NULL; ExtraDataRecordNode *edrn = NULL; ExtraDataRecordCache *edrc = NULL; - void *packet = NULL; if (ern == NULL) { @@ -1532,21 +1529,37 @@ static int spoolerExtraDataCacheClean(EventRecordNode *ern) { case UNIFIED2_IDS_EVENT: edrc = &((Unified2IDSEvent_legacy_WithPED *)(ern->data))->extra_data_cache; - packet = (((Unified2IDSEvent_legacy_WithPED *)(ern->data))->packet); + if (((Unified2IDSEvent_legacy_WithPED *)(ern->data))->packet != NULL) + { + free(((Unified2IDSEvent_legacy_WithPED *)(ern->data))->packet); + ((Unified2IDSEvent_legacy_WithPED *)(ern->data))->packet = NULL; + } break; case UNIFIED2_IDS_EVENT_MPLS: case UNIFIED2_IDS_EVENT_VLAN: edrc = &((Unified2IDSEvent_WithPED *)(ern->data))->extra_data_cache; - packet = ((Unified2IDSEvent_WithPED *)(ern->data))->packet; + if (((Unified2IDSEvent_WithPED *)(ern->data))->packet != NULL) + { + free(((Unified2IDSEvent_WithPED *)(ern->data))->packet); + ((Unified2IDSEvent_WithPED *)(ern->data))->packet = NULL; + } break; case UNIFIED2_IDS_EVENT_IPV6: edrc = &((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data))->extra_data_cache; - packet = ((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data))->packet; + if (((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data))->packet != NULL) + { + free(((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data))->packet); + ((Unified2IDSEventIPv6_legacy_WithPED *)(ern->data))->packet = NULL; + } break; case UNIFIED2_IDS_EVENT_IPV6_MPLS: case UNIFIED2_IDS_EVENT_IPV6_VLAN: edrc = &((Unified2IDSEventIPv6_WithPED *)(ern->data))->extra_data_cache; - packet = ((Unified2IDSEventIPv6_WithPED *)(ern->data))->packet; + if (((Unified2IDSEventIPv6_WithPED *)(ern->data))->packet != NULL) + { + free(((Unified2IDSEventIPv6_WithPED *)(ern->data))->packet); + ((Unified2IDSEventIPv6_WithPED *)(ern->data))->packet = NULL; + } break; case UNIFIED2_PACKET: case UNIFIED2_EXTRA_DATA: @@ -1556,12 +1569,6 @@ static int spoolerExtraDataCacheClean(EventRecordNode *ern) break; } - if (packet) - { - free(packet); - packet = NULL; - } - if (edrc == NULL || TAILQ_EMPTY(edrc)) return 1; diff --git a/src/unified2.h b/src/unified2.h index 20c9e5d..3712f44 100644 --- a/src/unified2.h +++ b/src/unified2.h @@ -100,7 +100,6 @@ typedef struct _Unified2IDSEvent_WithPED Unified2IDSEvent event; void *packet; ExtraDataRecordCache extra_data_cache; - //uint32_t extra_data_cached; }Unified2IDSEvent_WithPED; #endif @@ -135,7 +134,6 @@ typedef struct _Unified2IDSEventIPv6_WithPED Unified2IDSEventIPv6 event; void *packet; ExtraDataRecordCache extra_data_cache; //linked list of concurrent extra data records - //uint32_t extra_data_cached; }Unified2IDSEventIPv6_WithPED; #endif @@ -192,12 +190,12 @@ typedef enum _EventInfoEnum EVENT_INFO_FILE_MAILFROM, /* 18 */ EVENT_INFO_FILE_RCPTTO, /* 19 */ EVENT_INFO_FILE_EMAIL_HDRS, /* 20 */ -#else - EVENT_INFO_GZIP_DATA, -#endif EVENT_INFO_FTP_USER, /* 21 */ EVENT_INFO_SMB_UID, /* 22 */ EVENT_INFO_SMB_IS_UPLOAD, /* 23 */ +#else + EVENT_INFO_GZIP_DATA +#endif }EventInfoEnum; typedef enum _EventDataType @@ -239,10 +237,9 @@ typedef struct Unified2IDSEvent_legacy #ifdef RB_EXTRADATA typedef struct _Unified2IDSEvent_legacy_WithPED { - Unified2IDSEventIPv6 event; + Unified2IDSEvent_legacy event; void *packet; ExtraDataRecordCache extra_data_cache; //linked list of concurrent extra data records - //uint32_t extra_data_cached; }Unified2IDSEvent_legacy_WithPED; #endif @@ -271,10 +268,9 @@ typedef struct Unified2IDSEventIPv6_legacy #ifdef RB_EXTRADATA typedef struct _Unified2IDSEventIPv6_legacy_WithPED { - Unified2IDSEventIPv6 event; - void *packet; - ExtraDataRecordCache extra_data_cache; //linked list of concurrent extra data records - //uint32_t extra_data_cached; + Unified2IDSEventIPv6_legacy event; + void *packet; + ExtraDataRecordCache extra_data_cache; //linked list of concurrent extra data records }Unified2IDSEventIPv6_legacy_WithPED; #endif From f23a0759c65f554d702be03e5ffb1dc05efa4606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Fern=C3=A1ndez=20Barrera?= Date: Tue, 8 Mar 2016 14:04:00 +0100 Subject: [PATCH 186/198] Added more defaults options --- src/output-plugins/spo_alert_json.c | 35 +++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index c54b743..1d9ec8f 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -79,6 +79,12 @@ #include #define MAX_HTTP_DEFAULT_CONECTIONS 10 #define MAX_HTTP_DEFAULT_QUEUED_MESSAGES 10000 +#define HTTP_DEFAULT_TIMEOUT 30000 +#define HTTP_DEFAULT_CONN_TIMEOUT 10000 +#define HTTP_DEFAULT_BATCH_TIMEOUT 1000 +#define HTTP_DEFAULT_VERBOSE 0 +#define HTTP_DEFAULT_MODE 1 +#define HTTP_DEFAULT_INSECURE 0 #endif #include @@ -279,9 +285,12 @@ typedef struct _AlertJSONData struct { long max_connections; long max_queued_messages; - long conn_timeout; long req_timeout; + long conn_timeout; + long batch_timeout; long verbose; + long mode; + long insecure; int do_poll; pthread_t poll_thread; const char *url; @@ -473,6 +482,12 @@ static AlertJSONData *AlertJSONParseArgs(char *args) #ifdef HAVE_LIBRBHTTP data->http.max_connections = MAX_HTTP_DEFAULT_CONECTIONS; data->http.max_queued_messages = MAX_HTTP_DEFAULT_QUEUED_MESSAGES; + data->http.req_timeout = HTTP_DEFAULT_TIMEOUT; + data->http.conn_timeout = HTTP_DEFAULT_CONN_TIMEOUT; + data->http.batch_timeout = HTTP_DEFAULT_BATCH_TIMEOUT; + data->http.verbose = HTTP_DEFAULT_VERBOSE; + data->http.mode = HTTP_DEFAULT_MODE; + data->http.insecure = HTTP_DEFAULT_INSECURE; #endif for (i = 0; i < num_toks; i++) @@ -567,6 +582,10 @@ static AlertJSONData *AlertJSONParseArgs(char *args) #else /// @TODO use a function char *end=NULL; + if(!strncmp(tok,"http.mode=",strlen("http.mode="))) + { + data->http.mode = strtol(tok+strlen("http.mode="),&end,0); + } if(!strncmp(tok,"http.max_connections=",strlen("http.max_connections="))) { data->http.max_connections = strtol(tok+strlen("http.max_connections="),&end,0); @@ -587,6 +606,14 @@ static AlertJSONData *AlertJSONParseArgs(char *args) { data->http.verbose = strtol(tok+strlen("http.verbose="),&end,0); } + else if (!strncmp(tok,"http.insecure=",strlen("http.insecure="))) + { + data->http.insecure = strtol(tok+strlen("http.insecure="),&end,0); + } + else if (!strncmp(tok,"http.batch_timeout=",strlen("http.batch_timeout="))) + { + data->http.batch_timeout = strtol(tok+strlen("http.batch_timeout="),&end,0); + } if(NULL == end || *end != '\0') { @@ -927,8 +954,12 @@ static void AlertJsonHTTPDelayedInit (AlertJSONData *this) this->http.verbose); HTTPHandlerSetLongOpt(this->http.handler, "RB_HTTP_MAX_MESSAGES", this->http.max_queued_messages); + HTTPHandlerSetLongOpt(this->http.handler, "RB_HTTP_BATCH_TIMEOUT", + this->http.batch_timeout); HTTPHandlerSetLongOpt(this->http.handler, "RB_HTTP_MODE", - 1); + this->http.mode); + HTTPHandlerSetLongOpt(this->http.handler, "HTTP_INSECURE", + this->http.insecure); rb_http_handler_run(this->http.handler); From d6fb823f5b00681bec832460c46a986bc3fda17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Fern=C3=A1ndez=20Barrera?= Date: Thu, 10 Mar 2016 11:41:23 +0100 Subject: [PATCH 187/198] Added newline char to ErrorMessage on HTTP error --- src/output-plugins/spo_alert_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 1d9ec8f..f4fc5df 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -2362,7 +2362,7 @@ static void RealAlertJSON(Packet * p, void *event, uint32_t event_type, AlertJSO if(rc != 0) { - ErrorMessage("alert_json: Failed to produce HTTP message: %s", + ErrorMessage("alert_json: Failed to produce HTTP message: %s\n", err); DecRefcntPrintbuf(rprintbuf); } From 1d0f2e570dabae9284b81f932f28f958a6c73cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Sun, 28 Feb 2016 10:49:59 +0000 Subject: [PATCH 188/198] Printing file_size as json number --- src/output-plugins/spo_alert_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index f4fc5df..49fc3b3 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -116,7 +116,7 @@ #ifdef RB_EXTRADATA #define X_RB_EXTRADATA \ _X(SHA256,"sha256","sha256",stringFormat,"-") \ - _X(FILE_SIZE,"file_size","file_size",stringFormat,"-") \ + _X(FILE_SIZE,"file_size","file_size",numericFormat,"-") \ _X(FILE_HOSTNAME,"file_hostname","file_hostname",stringFormat,"-") \ _X(FILE_URI,"file_uri","file_uri",stringFormat,"-") \ _X(EMAIL_SENDER,"email_sender","email_sender",stringFormat,"-") \ From 4e9c18fddd7c03a70caa05da3ee778f38556f2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Wed, 27 Apr 2016 12:12:02 +0000 Subject: [PATCH 189/198] FIX: printMultipleMails reading beyond limits --- src/output-plugins/spo_alert_json.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/output-plugins/spo_alert_json.c b/src/output-plugins/spo_alert_json.c index 49fc3b3..32c1bad 100644 --- a/src/output-plugins/spo_alert_json.c +++ b/src/output-plugins/spo_alert_json.c @@ -1522,13 +1522,14 @@ static void printMultipleMails(const char *mails,int len, struct printbuf *print const char *cursor = mails; while(cursor) { - const char *end = memchr(cursor,',',len); + const size_t rest_of_mails = len - (cursor - mails); + const char *end = memchr(cursor,',',rest_of_mails); if (cursor != mails) { printbuf_memappend_fast_str(printbuf, ","); } - int mail_len = end ? end - cursor : len - (cursor - mails); + int mail_len = end ? end - cursor : rest_of_mails; printbuf_memappend_fast_str(printbuf, "\\\""); printMail(cursor, mail_len, printbuf); From 12f2a9a9d8087b769c6f7410790d25a755082650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Wed, 27 Apr 2016 10:43:23 +0000 Subject: [PATCH 190/198] Use printbuf_memappend_escaped in EVENT_INFO_FILE_NAME Before of this, names with characters '\', '"' or control ones (blob_length) - sizeof(U2ExtraData->data_type) - sizeof(U2ExtraData->blob_length)); - printbuf_memappend_fast(printbuf, str, len); + printbuf_memappend_escaped(printbuf, str, len); } break; case FILE_HOSTNAME: diff --git a/src/rbutil/rb_printbuf.c b/src/rbutil/rb_printbuf.c index 6a9ad3b..5cb1a5f 100644 --- a/src/rbutil/rb_printbuf.c +++ b/src/rbutil/rb_printbuf.c @@ -106,6 +106,50 @@ int printbuf_memappend(struct printbuf *p, const char *buf, int size) return size; } +int printbuf_memappend_escaped(struct printbuf *p, const char *buf, int size) +{ + const int bsize = p->bpos; + /// @TODO we can avoid this copy if we don't use strcspn + char *aux_buf = calloc(size + 1,1); + if (NULL == aux_buf) { + return 0; /* We did our best! */ + } + + memcpy(aux_buf, buf, size); + + static const char escape_this[] = "\\\"" + "\x19\x18\x17\x16\x15\x14\x13\x12\x11\x10" + "\x09\x08\x07\x06\x05\x04\x03\x02\x01"; + const char *cursor = aux_buf; + while (1) { + const size_t span = strcspn(cursor, escape_this); + printbuf_memappend_fast(p, cursor, span); + cursor += span; + if (!(cursor < aux_buf + size)) { + break; + } + + /* We are in a character we need to escape */ + printbuf_memappend_fast_str(p, "\\"); + switch(cursor[0]) { + case '\\': + case '"': + printbuf_memappend_fast(p, cursor, 1); + break; + default: /* Control code */ + printbuf_memappend_fast_str(p, "u00"); + printbuf_memappend_fast_n16(p, cursor[0]); + break; + }; + cursor++; + } + + free(aux_buf); + + return p->bpos - bsize; +} + + int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len) { int size_needed; diff --git a/src/rbutil/rb_printbuf.h b/src/rbutil/rb_printbuf.h index f62820e..25c1782 100644 --- a/src/rbutil/rb_printbuf.h +++ b/src/rbutil/rb_printbuf.h @@ -50,6 +50,10 @@ do { \ } else { printbuf_memappend(p, (bufptr), bufsize); } \ } while (0) +/* Same as printbuf_memappend, buf it will escape JSON chars ('\', '"', and + control codes Date: Fri, 29 Apr 2022 16:15:12 +0100 Subject: [PATCH 191/198] change service script --- rpm/barnyard2 | 367 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 289 insertions(+), 78 deletions(-) diff --git a/rpm/barnyard2 b/rpm/barnyard2 index ffb721f..1535de2 100644 --- a/rpm/barnyard2 +++ b/rpm/barnyard2 @@ -1,101 +1,312 @@ -#!/bin/sh +#!/bin/bash +# $Id$ # -# Init file for Barnyard2 +# barnyard2 Start/Stop the barnyard2 daemon. # -# -# chkconfig: 2345 40 60 +# chkconfig: 2345 57 61 # description: Barnyard2 is an output processor for snort. # -# processname: barnyard2 -# config: /etc/sysconfig/barnyard2 -# config: /etc/snort/barnyard.conf -# pidfile: /var/lock/subsys/barnyard2.pid +# Created by Juan Jesus Prieto (jjprieto@redborder.net) +# Pablo Nebrera (pablonebrera@redborder.net) +# +# Source function library. +SYSTEMCTL_SKIP_REDIRECT=true -source /etc/rc.d/init.d/functions -source /etc/sysconfig/network +lockfile="/var/lock/barnyard2.lck" +locked=0 +subsysfile="/var/lock/subsys/barnyard2" -### Check that networking is up. -[ "${NETWORKING}" == "no" ] && exit 0 +if [ -f $lockfile ]; then + if [ "x$1" == "xstatus" ]; then + locked=1 + else + PIDLOCK=$(<$lockfile) + if [ "x$PIDLOCK" != "x" ]; then + if [ ! -f /proc/$PIDLOCK/cmdline ]; then + echo "The process barnyard2 looks locked but the 'lock proccess' is not running. Unblocking it!!" + PIDLOCK="" + else + strings /proc/$PIDLOCK/cmdline | grep -q "barnyard2" + if [ $? -ne 0 ]; then + echo "The process barnyard2 looks locked but the 'lock proccess' is not running. Unblocking it!!" + PIDLOCK="" + fi + fi + fi + + if [ "x$PIDLOCK" != "x" ]; then + if [ "x$WAIT" == "x1" ]; then + echo "Barnyard2 init script is locked ($lockfile). Waiting until it finish ..." + counter=1 + max_counter=600 + while [ $counter -lt $max_counter ]; do + if [ -f $lockfile ]; then + counter=$(( $counter +1 )) + sleep 1 + else + counter=$max_counter + fi + done + fi -[ -x /usr/sbin/snort ] || exit 1 -[ -r /etc/snort/snort.conf ] || exit 1 + if [ -f $lockfile ]; then + echo "The lock file $lockfile exist (PID: $PIDLOCK). Exiting!" + exit 0 + fi + fi + fi +fi -### Default variables -SYSCONFIG="/etc/sysconfig/barnyard2" -### Read configuration -[ -r "$SYSCONFIG" ] && source "$SYSCONFIG" -RETVAL=0 +if [ "x$1" != "xstatus" ]; then + trap "rm -f $lockfile" 0 2 5 15 + echo $$ > $lockfile +fi + +. /etc/rc.d/init.d/functions + +#RBDIR="" +PATH="$PATH:$RBDIR/bin" +SNORTBIN=$(which snort) +NUMCPUS=$(ls -d /sys/devices/system/cpu/cpu[0-9]*|wc -l) +[ $NUMCPUS -lt 1 ] && NUMCPUS=1 +NUMCPUS_1=$(($NUMCPUS-1)) prog="barnyard2" -desc="Snort Output Processor" - -start() { - echo -n $"Starting $desc ($prog): " - for INT in $INTERFACES; do - PIDFILE="/var/lock/subsys/barnyard2-$INT.pid" - ARCHIVEDIR="$SNORTDIR/$INT/archive" - WALDO_FILE="$SNORTDIR/$INT/barnyard2.waldo" - BARNYARD_OPTS="-D -c $CONF -d $SNORTDIR/${INT} -w $WALDO_FILE -L $SNORTDIR/${INT} -a $ARCHIVEDIR -f $LOG_FILE -X $PIDFILE $EXTRA_ARGS" - daemon $prog $BARNYARD_OPTS - done - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog - return $RETVAL -} +USER="snort" +GROUP="snort" +RETVAL=0 + +mkdir -p /var/log/barnyard2 +chown -R ${USER}:${GROUP} /var/log/barnyard2 + +declare -a affinity +for n in $(seq 0 ${NUMCPUS_1}); do + affinity[$n]=$(echo "ibase=10;obase=16;2^$n"|bc) +done + +source /usr/lib/redborder/bin/rb_initscripts.sh + +f_start_instance() { + + local PIDFILE LOGDIR ARCHIVEDIR WALDO_FILE + for instance in $@; do + PIDFILE="/var/lock/subsys/${prog}_${INSTANCES_GROUP}-${instance}.pid" + LOGDIR="$SNORTDIR/instance-${instance}" + ARCHIVEDIR="$LOGDIR/archive" + WALDO_FILE="$LOGDIR/${prog}.waldo" + + f_check_instance ${INSTANCES_GROUP} ${instance} + if [ $? -ne 0 ]; then + # instance is not running + RET=0 + [ ! -d ${LOGDIR} ] && mkdir -p ${LOGDIR} + [ ! -d ${LOGDIR}/stats ] && mkdir -p ${LOGDIR}/stats + chown -R $USER:$GROUP $LOGDIR + + echo -n "Starting ${prog} " + + echo -n "(${INSTANCES_GROUP_NAME}-${instance}): " + + mkdir -p ${ARCHIVEDIR} + chown -R $USER:$GROUP ${ARCHIVEDIR} + + [ "x$EVENT_CACHE" == "x" ] && EVENT_CACHE=2048 + + daemon env INSTANCE=\"${instance}\" INSTANCES_GROUP=\"${INSTANCES_GROUP}\" \ + INSTANCES_GROUP_NAME=\"${INSTANCES_GROUP_NAME}\" CPU_LIST=\"${CPU_LIST}\" BIND_CPU=\"${v_cpu[${instance}]}\" \ + taskset -c ${v_cpu[${instance}]} ionice -c 3 nice -n 15 $prog -D -c $CONF -d ${LOGDIR} -w ${WALDO_FILE} --event-cache-size ${EVENT_CACHE} \ + -a ${ARCHIVEDIR} -f ${LOG_FILE} -X ${PIDFILE} ${EXTRA_ARGS} -i "instance_${INSTANCES_GROUP}" -r \"-${instance}\" --create-pidfile &>/dev/null -stop() { - echo -n $"Shutting down $desc ($prog): " - killproc $prog - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog - return $RETVAL + RET=$? + [ $RET -ne 0 ] && RETVAL=$RET + print_result $RET + fi + done + + return $RET } -restart() { - stop - start +f_start_group() { + + local INSTANCES_GROUP=$1 + local config_group_file=/etc/sysconfig/${prog}-${INSTANCES_GROUP} + local v_cpu + local PIDFILE LOGDIR ARCHIVEDIR WALDO_FILE + source ${config_group_file} + + if [ -f ${config_group_file}_local ]; then + source ${config_group_file}_local + fi + + [ "x${SNORTDIR}" == "x" ] && SNORTDIR="/var/log/snort/${INSTANCES_GROUP}" + + [ "x${ENABLED}" != "x0" ] && ENABLED=1 || return 0 + [ "x${INSTANCES_GROUP_NAME}" == "x" ] && INSTANCES_GROUP_NAME="group_${INSTANCES_GROUP}" + [ "x${USER}" == "x" ] && USER="snort" + [ "x${GROUP}" == "x" ] && GROUP="snort" + [ "x${LOGDIR}" == "x" ] && LOGDIR=/var/log/snort/${INSTANCES_GROUP} + [ "x${CONF}" == "x" ] && CONF="/etc/snort/${INSTANCES_GROUP}/${prog}.conf" + + [ ! -f /etc/snort/${INSTANCES_GROUP}/${prog}.conf -a -f /etc/snort/${prog}.conf.default ] && \ + cp /etc/snort/${prog}.conf.default /etc/snort/${INSTANCES_GROUP}/${prog}.conf + + [ "x${CPU_LIST}" == "x" ] && CPU_LIST=$(seq 0 ${NUMCPUS_1} | tr '\n' ',' | sed 's/,$//') + v_cpu=( $(echo ${CPU_LIST} | tr ',' ' ') ) + + f_start_instance ${!v_cpu[*]} } +f_status() { + + declare -A instances_group_list + declare -A instances_list + local ret=0 + local core pid config_group_file INSTANCE + for pid in $(pidof ${prog}); do + INSTANCES_GROUP=$(f_get_pid_value ${pid} 'INSTANCES_GROUP') + instances_group_list[${INSTANCES_GROUP}]="${instances_group_list[${INSTANCES_GROUP}]} ${pid}" + done + for config_group_file in $(ls /etc/sysconfig/${prog}-* 2>/dev/null | grep "${prog}-[0-9][0-9]*$" | sort); do + INSTANCES_GROUP=$(f_get_config_value "${config_group_file}" 'INSTANCES_GROUP') + [ "x${INSTANCES_GROUP}" == "x" ] && INSTANCES_GROUP="$(echo ${config_group_file} | sed 's/.*-\([0-9]*\)$/\1/')" + if [ "x${instances_group_list[${INSTANCES_GROUP}]}" == "x" ]; then + instances_group_list[${INSTANCES_GROUP}]="n/a" + fi + done + + INSTANCES_GROUP="" -reload() { - echo -n $"Reloading $desc ($prog): " - killproc $prog -HUP - RETVAL=$? - echo - return $RETVAL + for INSTANCES_GROUP in ${!instances_group_list[*]}; do + INSTANCES_GROUP_NAME="" + CPU_LIST="" + INTERFACES="" + unset instances_list + declare -A instances_list + for pid in ${instances_group_list[${INSTANCES_GROUP}]}; do + # getting instance number for this pid + if [ "x${pid}" != "xn/a" ]; then + INSTANCE=$(f_get_pid_value ${pid} 'INSTANCE') + instances_list[${INSTANCE}]=${pid} + CPU_LIST=$(f_get_pid_value ${pid} 'CPU_LIST') + INTERFACES=$(f_get_pid_value ${pid} 'INTERFACES') + INSTANCES_GROUP_NAME=$(f_get_pid_value ${pid} 'INSTANCES_GROUP_NAME') + fi + done + # checking every instance have a pid + if [ "x${CPU_LIST}" == "x" ]; then + CPU_LIST=$(f_get_config_value "/etc/sysconfig/${prog}-${INSTANCES_GROUP}" 'CPU_LIST') + fi + [ "x${CPU_LIST}" == "x" ] && CPU_LIST=$(seq 0 ${NUMCPUS_1} | tr '\n' ',' | sed 's/,$//') + CPU_TOTAL=$(echo ${CPU_LIST} | tr ',' '\n' | wc -l) + INSTANCE_MAX=$((${CPU_TOTAL}-1)) + for INSTANCE in $(seq 0 ${INSTANCE_MAX}); do + if [ "x${instances_list[${INSTANCE}]}" == "x" ]; then + instances_list[${INSTANCE}]="n/a" + ret=1 + fi + done + + if [ -f /etc/sysconfig/${prog}-${INSTANCES_GROUP} ]; then + INSTANCES_GROUP_NAME=$(f_get_config_value "/etc/sysconfig/${prog}-${INSTANCES_GROUP}" 'INSTANCES_GROUP_NAME') + fi + [ "x${INSTANCES_GROUP_NAME}" == "x" ] && INSTANCES_GROUP_NAME="group_${INSTANCES_GROUP}" + + echo "-------------------------------------------------------------------------------" + echo -n " Group Name: " + set_color blue + echo "${INSTANCES_GROUP_NAME}" + set_color norm + + echo "-------------------------------------------------------------------------------" + printf " %-10s %-15s %-15s %-15s %-15s\n" "Instance" "PID" "CPU" " " "Status" + echo "-------------------------------------------------------------------------------" + + for INSTANCE in $(echo ${!instances_list[*]} | tr ' ' '\n' | sort -n); do + pid=${instances_list[${INSTANCE}]} + if [ "x${pid}" != "xn/a" ]; then + coremask=$(taskset -p $pid | sed 's/^.*: \([0-9]*\)$/\1/') + for core in ${!affinity[*]}; do + if [ "x${affinity[${core}]}" == "x${coremask}" ]; then + # found core thread number + break + fi + done + if [ $core -ge 10 ]; then + core_string="${core}" + else + core_string="${core} " + fi + else + core_string="n/a" + fi + printf " %-10s %-15s %-15s" "${INSTANCE}" "${pid}" "${core_string}" + if [ "x${pid}" != "xn/a" ]; then + print_result 0 + else + print_result 1 + fi + done + + echo "-------------------------------------------------------------------------------" + + echo + done + + return $ret } +action=$1 +shift -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - restart - ;; - reload) - reload - ;; - condrestart) - [ -e /var/lock/subsys/$prog ] && restart - RETVAL=$? - ;; - status) - status $prog - RETVAL=$? - ;; - dump) - dump - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload|condrestart|status|dump}" - RETVAL=1 +case "${action}" in + start) + f_start $1 + touch $subsysfile + ;; + stop) + f_stop $1 + ;; + reload) + RETVAL=0 + PIDS=$(pidof ${prog}) + if [ "x$PIDS" == "x" ]; then + f_stop $1 + f_start $1 + else + f_reload $1 + fi + touch $subsysfile + ;; + restart) + f_stop $1 + f_start $1 + ;; + condrestart) + if [ -e $subsysfile ]; then + f_stop $1 + f_start $1 + fi + ;; + clean) + f_clean + if [ "x$(pidof ${prog})" != "x" ]; then + touch $subsysfile + fi + ;; + cleanstop) + f_clean stop + ;; + status) + f_status + RETVAL=$? + ;; + *) + echo "Usage: $0 {start|stop|reload|restart|condrestart|clean|cleanstop|status}" + RETVAL=2 esac +[ $locked -eq 1 ] && RETVAL=0 exit $RETVAL + +## vim:ts=4:sw=4:expandtab:ai:nowrap:formatoptions=croqln: From 705de4fe01380a76fdfd38334c301c40831649a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Negr=C3=B3n?= Date: Wed, 11 May 2022 14:37:49 +0200 Subject: [PATCH 192/198] Adding systemd service --- rpm/barnyard2.service | 15 +++++++++++++++ rpm/barnyard2.spec | 7 ++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 rpm/barnyard2.service diff --git a/rpm/barnyard2.service b/rpm/barnyard2.service new file mode 100644 index 0000000..2cb171a --- /dev/null +++ b/rpm/barnyard2.service @@ -0,0 +1,15 @@ +[Unit] +SourcePath=/etc/rc.d/init.d/barnyard2 +Description=SYSV: Barnyard2 is an output processor for snort. + +[Service] +Type=forking +Restart=no +TimeoutSec=5min +IgnoreSIGPIPE=no +KillMode=process +GuessMainPID=no +RemainAfterExit=yes +ExecStart=/etc/rc.d/init.d/barnyard2 start +ExecStop=/etc/rc.d/init.d/barnyard2 stop +ExecReload=/etc/rc.d/init.d/barnyard2 reload diff --git a/rpm/barnyard2.spec b/rpm/barnyard2.spec index 983a81b..f35e635 100644 --- a/rpm/barnyard2.spec +++ b/rpm/barnyard2.spec @@ -127,11 +127,12 @@ make %install %makeinstall - +%{__mkdir_p} -p $RPM_BUILD_ROOT/usr/lib/systemd/system/ %{__install} -d -p $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,rc.d/init.d,snort} %{__install} -m 644 rpm/barnyard2.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/barnyard2 %{__install} -m 755 rpm/barnyard2 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/barnyard2 -%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/barnyard2.conf $RPM_BUILD_ROOT%{_sysconfdir}/snort/ +%{__install} -p -m 0644 rpm/barnyard2.service $RPM_BUILD_ROOT/usr/lib/systemd/system/barnyard2.service +%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/barnyard2.conf %clean @@ -143,9 +144,9 @@ fi %defattr(-,root,root) %doc LICENSE doc/INSTALL doc/README.* %attr(755,root,root) %{_bindir}/barnyard2 -%attr(640,root,root) %config %{_sysconfdir}/snort/barnyard2.conf %attr(755,root,root) %config %{_sysconfdir}/rc.d/init.d/barnyard2 %attr(644,root,root) %config %{_sysconfdir}/sysconfig/barnyard2 +%attr(644,root,root) /usr/lib/systemd/system/barnyard2.service %changelog * Thu Feb 02 2012 Brent Woodruff From ef6ea9abd4671ce27ab3f0703b747082fb07e224 Mon Sep 17 00:00:00 2001 From: David Vanhoucke Date: Mon, 6 Nov 2023 08:56:58 +0000 Subject: [PATCH 193/198] rpm build --- Makefile.in | 44 ++-- aclocal.m4 | 69 ++--- compile | 2 +- config.guess | 173 +------------ config.sub | 36 ++- configure | 22 +- configure.in | 1 + configure.sh | 1 + doc/Makefile.in | 22 +- etc/Makefile.in | 22 +- install-sh | 366 +++++++++++++-------------- m4/Makefile.in | 22 +- m4/libtool.m4 | 6 +- missing | 2 +- rpm/Makefile.in | 22 +- rpm/barnyard2.spec | 7 +- rpm/rpm_build.sh | 3 + schemas/Makefile.in | 22 +- src/Makefile.in | 22 +- src/input-plugins/Makefile.in | 22 +- src/output-plugins/Makefile.in | 22 +- src/output-plugins/spo_alert_fwsam.c | 8 +- src/rbutil/Makefile.in | 22 +- src/sfutil/Makefile.in | 22 +- 24 files changed, 478 insertions(+), 482 deletions(-) create mode 100755 configure.sh create mode 100755 rpm/rpm_build.sh diff --git a/Makefile.in b/Makefile.in index 2ce2dff..912319d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in COPYING README compile config.guess \ - config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -89,6 +95,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -154,6 +162,9 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \ + README compile config.guess config.sub install-sh ltmain.sh \ + missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -346,7 +357,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -577,15 +587,15 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -621,17 +631,17 @@ distcheck: dist esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -808,6 +818,8 @@ uninstall-am: mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/aclocal.m4 b/aclocal.m4 index bdebcb2..b526132 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -573,7 +572,11 @@ to "yes", and re-run configure. END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -602,7 +605,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -730,7 +733,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -771,7 +774,7 @@ fi # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -798,7 +801,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -827,7 +830,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -874,7 +877,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -893,7 +896,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -974,7 +977,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1034,7 +1037,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1062,7 +1065,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1081,7 +1084,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/compile b/compile index 531136b..a85b723 100755 --- a/compile +++ b/compile @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff --git a/config.guess b/config.guess index 9afd676..6c32c86 100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-11-29' +timestamp='2014-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ timestamp='2013-11-29' # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -579,8 +579,9 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -826,7 +827,7 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +970,10 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1371,154 +1372,6 @@ EOF exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -283,8 +283,10 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -296,11 +298,11 @@ case $basic_machine in | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -311,6 +313,7 @@ case $basic_machine in | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -325,6 +328,9 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -402,8 +408,10 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -415,6 +423,7 @@ case $basic_machine in | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -432,6 +441,7 @@ case $basic_machine in | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -769,6 +779,9 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -824,6 +837,10 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1369,14 +1386,14 @@ case $os in | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1594,9 +1611,6 @@ case $basic_machine in mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff --git a/configure b/configure index 75037bf..8df1ba9 100755 --- a/configure +++ b/configure @@ -2531,7 +2531,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h" -am__api_version='1.14' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2732,8 +2732,8 @@ test "$program_suffix" != NONE && ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2752,7 +2752,7 @@ else $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3081,8 +3081,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -3141,6 +3141,7 @@ END fi + case `pwd` in *\ * | *\ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -10777,10 +10778,14 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -14060,6 +14065,7 @@ fi done fi +LIBS="$LIBS -lpthread" # some funky macro to be backwards compatible with earlier autoconfs # in current they have AC_CHECK_DECLS @@ -17201,7 +17207,7 @@ config.status configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." diff --git a/configure.in b/configure.in index a5199ee..e39b365 100644 --- a/configure.in +++ b/configure.in @@ -340,6 +340,7 @@ if test "$sunos4" != "no"; then AC_CHECK_FUNCS(vsnprintf,, LIBS="$LIBS -ldb") AC_CHECK_FUNCS(strtoul,, LIBS="$LIBS -l44bsd") fi +LIBS="$LIBS -lpthread" # some funky macro to be backwards compatible with earlier autoconfs # in current they have AC_CHECK_DECLS diff --git a/configure.sh b/configure.sh new file mode 100755 index 0000000..c2be093 --- /dev/null +++ b/configure.sh @@ -0,0 +1 @@ +./configure --prefix=/ --sbindir=/usr/sbin --exec-prefix=/ --enable-ipv6 --enable-geo-ip --enable-kafka --with-rdkafka-includes=/usr/include --with-rdkafka-libraries=/usr/lib --with-macs-vendors-includes=/usr/include --with-macs-vendors-libraries=/usr/lib64 --enable-rb-macs-vendors --enable-rb-http --enable-debug diff --git a/doc/Makefile.in b/doc/Makefile.in index 19f1ca3..0d3e155 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am INSTALL ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -86,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -112,6 +122,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in INSTALL DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -257,7 +268,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -432,6 +442,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/etc/Makefile.in b/etc/Makefile.in index 2d17664..7b24f6c 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = etc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -86,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -112,6 +122,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -257,7 +268,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign etc/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign etc/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -430,6 +440,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + install-data-am: test -e $(DESTDIR)$(sysconfdir) || \ diff --git a/install-sh b/install-sh index 377bb86..0b0fdcb 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -207,6 +203,15 @@ if test $# -eq 0; then exit 0 fi +if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 @@ -223,16 +228,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ do # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff --git a/m4/Makefile.in b/m4/Makefile.in index 2b67b35..b8bbb0f 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -86,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -112,6 +122,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -259,7 +270,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign m4/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -434,6 +444,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 44e0ecf..56666f0 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -2669,10 +2669,14 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/missing b/missing index db98974..f62bbae 100755 --- a/missing +++ b/missing @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff --git a/rpm/Makefile.in b/rpm/Makefile.in index ac3fe2a..9e43f01 100644 --- a/rpm/Makefile.in +++ b/rpm/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = rpm -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -86,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -112,6 +122,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -261,7 +272,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign rpm/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign rpm/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -436,6 +446,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/rpm/barnyard2.spec b/rpm/barnyard2.spec index f35e635..fa20fce 100644 --- a/rpm/barnyard2.spec +++ b/rpm/barnyard2.spec @@ -43,7 +43,7 @@ Summary: Snort Log Backend Name: barnyard2 -Version: 1.13 +Version: 1.14 Source0: https://github.com/firnsy/barnyard2/archive/v2-%{version}.tar.gz Release: 1%{?dist} License: GPL @@ -57,6 +57,7 @@ BuildRequires: libpcap1-devel BuildRequires: libpcap-devel %endif +Requires: librd0 librdkafka1 %description Barnyard has 3 modes of operation: @@ -107,6 +108,10 @@ ORACLE_HOME=%{OracleHome} %build +git clone --branch v0.9.2 https://github.com/edenhill/librdkafka.git /tmp/librdkafka-v0.9.2 +cd /tmp/librdkafka-v0.9.2 +./configure --prefix=/usr --sbindir=/usr/bin --exec-prefix=/usr && make +make install %configure \ %if %{libpcap1} diff --git a/rpm/rpm_build.sh b/rpm/rpm_build.sh new file mode 100755 index 0000000..60ee161 --- /dev/null +++ b/rpm/rpm_build.sh @@ -0,0 +1,3 @@ +rm -f /root/rpmbuild/SOURCES/v2-1.14.tar.gz +( cd /root/projects && tar cfzv /root/rpmbuild/SOURCES/v2-1.14.tar.gz barnyard2-1.14 ) +rpmbuild -ba --target x86_64 barnyard2.spec diff --git a/schemas/Makefile.in b/schemas/Makefile.in index 704c3d5..0de3c00 100644 --- a/schemas/Makefile.in +++ b/schemas/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = schemas -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -86,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -112,6 +122,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -263,7 +274,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign schemas/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign schemas/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -438,6 +448,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/Makefile.in b/src/Makefile.in index 5316418..2f91b68 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,7 +90,6 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = barnyard2$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -88,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -182,6 +192,7 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -383,7 +394,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -753,6 +763,8 @@ uninstall-am: uninstall-binPROGRAMS mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-binPROGRAMS +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/input-plugins/Makefile.in b/src/input-plugins/Makefile.in index 0e3f088..de40a3e 100644 --- a/src/input-plugins/Makefile.in +++ b/src/input-plugins/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/input-plugins -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -87,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -164,6 +174,7 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -311,7 +322,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/input-plugins/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/input-plugins/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -560,6 +570,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/output-plugins/Makefile.in b/src/output-plugins/Makefile.in index be295d3..dd74460 100644 --- a/src/output-plugins/Makefile.in +++ b/src/output-plugins/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/output-plugins -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -87,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -174,6 +184,7 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -343,7 +354,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/output-plugins/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/output-plugins/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -592,6 +602,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/output-plugins/spo_alert_fwsam.c b/src/output-plugins/spo_alert_fwsam.c index 99afd4d..45b5ff0 100644 --- a/src/output-plugins/spo_alert_fwsam.c +++ b/src/output-plugins/spo_alert_fwsam.c @@ -115,7 +115,7 @@ #include #endif -typedef int SOCKET; +typedef int BARNYARD2_SOCKET; #ifndef INVALID_SOCKET #define INVALID_SOCKET -1 @@ -963,7 +963,7 @@ void AlertFWsam(Packet *p, void *event, uint32_t event_type, void *arg) FWsamPacket sampacket; FWsamStation *station=NULL; FWsamList *fwsamlist; - SOCKET stationsocket; + BARNYARD2_SOCKET stationsocket; int i,len,deletestation,stationtry=0; char *encbuf,*decbuf; static unsigned long lastbsip[FWSAM_REPET_BLOCKS]; @@ -1389,7 +1389,7 @@ void AlertFWsam(Packet *p, void *event, uint32_t event_type, void *arg) void FWsamCheckOut(FWsamStation *station) { FWsamPacket sampacket; - SOCKET stationsocket; + BARNYARD2_SOCKET stationsocket; int i,len; char *encbuf,*decbuf; @@ -1540,7 +1540,7 @@ int FWsamCheckIn(FWsamStation *station) int i,len,stationok=TRUE; FWsamPacket sampacket; char *encbuf,*decbuf; - SOCKET stationsocket; + BARNYARD2_SOCKET stationsocket; /* create a socket for the station */ diff --git a/src/rbutil/Makefile.in b/src/rbutil/Makefile.in index 291d6e8..27f2170 100644 --- a/src/rbutil/Makefile.in +++ b/src/rbutil/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/rbutil -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -87,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -165,6 +175,7 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -312,7 +323,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/rbutil/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/rbutil/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -561,6 +571,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/sfutil/Makefile.in b/src/sfutil/Makefile.in index 77d3857..11ba64d 100644 --- a/src/sfutil/Makefile.in +++ b/src/sfutil/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/sfutil -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -87,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -167,6 +177,7 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -325,7 +336,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/sfutil/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/sfutil/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -574,6 +584,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. From 64470a920f2581e7c3687ca9a9228bb4c798e88a Mon Sep 17 00:00:00 2001 From: David Vanhoucke Date: Mon, 6 Nov 2023 14:31:38 +0000 Subject: [PATCH 194/198] make compatible with rhel9 --- Makefile.in | 61 +- aclocal.m4 | 195 +- compile | 17 +- config.guess | 757 +++-- config.h.in | 3 +- config.sub | 2509 +++++++-------- configure | 2298 +++++++------ configure.in | 4 +- configure.sh | 2 +- doc/Makefile.in | 17 +- etc/Makefile.in | 17 +- install-sh | 60 +- ltmain.sh | 5530 ++++++++++++++++++++------------ m4/Makefile.in | 17 +- m4/libtool.m4 | 2562 ++++++++------- m4/ltoptions.m4 | 127 +- m4/ltsugar.m4 | 7 +- m4/ltversion.m4 | 12 +- m4/lt~obsolete.m4 | 7 +- missing | 16 +- rpm/Makefile.in | 17 +- rpm/barnyard2.spec | 9 +- schemas/Makefile.in | 17 +- src/Makefile.in | 19 +- src/input-plugins/Makefile.in | 17 +- src/output-plugins/Makefile.in | 17 +- src/rbutil/Makefile.in | 17 +- src/sfutil/Makefile.in | 17 +- 28 files changed, 8418 insertions(+), 5930 deletions(-) diff --git a/Makefile.in b/Makefile.in index 912319d..596f656 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -116,7 +116,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ @@ -139,9 +139,9 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in + cscope distdir distdir-am dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -255,6 +255,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -326,6 +327,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -363,8 +365,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -506,7 +508,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -571,7 +576,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -586,6 +591,10 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -597,7 +606,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -615,7 +624,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -625,9 +634,11 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -805,18 +816,18 @@ uninstall-am: am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am .PRECIOUS: Makefile diff --git a/aclocal.m4 b/aclocal.m4 index b526132..e6498d0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.16.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.16.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,13 +332,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -346,49 +345,43 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -397,18 +390,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -495,8 +487,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -563,7 +555,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -605,7 +597,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -626,7 +618,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -648,7 +640,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -683,7 +675,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -691,49 +683,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -774,7 +759,7 @@ fi # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -801,7 +786,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -830,7 +815,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -877,7 +862,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -896,7 +881,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -977,7 +962,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1037,7 +1022,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1065,7 +1050,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1084,7 +1069,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/compile b/compile index a85b723..23fcba0 100755 --- a/compile +++ b/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC # 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, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/config.guess b/config.guess index 6c32c86..b33c9e8 100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2014-11-04' +timestamp='2018-08-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ timestamp='2014-11-04' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,7 +27,7 @@ timestamp='2014-11-04' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -39,7 +39,7 @@ Usage: $0 [OPTION] Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -84,8 +84,6 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' 1 2 15 - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -96,34 +94,39 @@ trap 'exit 1' 1 2 15 # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 +trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 + +set_cc_for_build() { + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$driver" + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi @@ -132,14 +135,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu - eval $set_cc_for_build - cat <<-EOF > $dummy.c + set_cc_for_build + cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc @@ -149,13 +152,20 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -168,21 +178,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ + echo unknown)` + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + earmv*) + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown + ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in + # to ELF recently (or will in the future) and ABI. + case "$UNAME_MACHINE_ARCH" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -197,44 +217,67 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac + # Determine ABI tags. + case "$UNAME_MACHINE_ARCH" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "$machine-${os}${release}${abi-}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; + *:Sortix:*:*) + echo "$UNAME_MACHINE"-unknown-sortix + exit ;; + *:Redox:*:*) + echo "$UNAME_MACHINE"-unknown-redox + exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -251,63 +294,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -319,7 +353,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -346,38 +380,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + case `isainfo -b` in + 32) + echo i386-pc-solaris2"$UNAME_REL" + ;; + 64) + echo x86_64-pc-solaris2"$UNAME_REL" + ;; + esac exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -386,25 +415,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -415,44 +444,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -461,23 +490,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -503,17 +532,17 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -530,7 +559,7 @@ EOF echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -542,14 +571,14 @@ EOF if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -560,7 +589,7 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -574,7 +603,7 @@ EOF exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -583,18 +612,18 @@ EOF IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -609,28 +638,28 @@ EOF echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + case "$sc_cpu_version" in + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + case "$sc_kernel_bits" in + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -663,13 +692,13 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ "$HP_ARCH" = hppa2.0w ] then - eval $set_cc_for_build + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -680,23 +709,23 @@ EOF # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -721,11 +750,11 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -734,7 +763,7 @@ EOF *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -742,9 +771,9 @@ EOF exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -769,127 +798,120 @@ EOF echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" + exit ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + else + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + fi exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case "$UNAME_PROCESSOR" in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + *:Minix:*:*) + echo "$UNAME_MACHINE"-unknown-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -902,58 +924,64 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; + e2k:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + k1om:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el @@ -967,64 +995,70 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; + mips64el:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" + exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1038,34 +1072,34 @@ EOF # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1075,12 +1109,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1090,9 +1124,9 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1100,7 +1134,7 @@ EOF # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1112,9 +1146,9 @@ EOF exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1134,9 +1168,9 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1145,28 +1179,28 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1177,7 +1211,7 @@ EOF *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1197,23 +1231,23 @@ EOF exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1232,46 +1266,56 @@ EOF echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" + exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build + set_cc_for_build if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1282,27 +1326,33 @@ EOF # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + NEO-*:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + NSR-*:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1311,18 +1361,19 @@ EOF echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + # shellcheck disable=SC2154 + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1343,14 +1394,14 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1359,34 +1410,48 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx + exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs exit ;; esac +echo "$0: unable to guess system type" >&2 + +case "$UNAME_MACHINE:$UNAME_SYSTEM" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp @@ -1405,16 +1470,16 @@ hostinfo = `(hostinfo) 2>/dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/config.h.in b/config.h.in index a4c46a3..671f7f9 100644 --- a/config.h.in +++ b/config.h.in @@ -228,8 +228,7 @@ /* Define if Linux */ #undef LINUX -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Define if MacOS */ diff --git a/config.sub b/config.sub index 7ffe373..b51fb8c 100755 --- a/config.sub +++ b/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2014-12-03' +timestamp='2018-08-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ timestamp='2014-12-03' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,7 +33,7 @@ timestamp='2014-12-03' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,12 +53,11 @@ timestamp='2014-12-03' me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -68,7 +67,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -95,7 +94,7 @@ while test $# -gt 0 ; do *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -111,1228 +110,1159 @@ case $# in exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac +# Split fields of configuration type +IFS="-" read -r field1 field2 field3 field4 <&2 + exit 1 ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + *-*-*-*) + basic_machine=$field1-$field2 + os=$field3-$field4 ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ + | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova*) + basic_machine=$field1 + os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + os=linux-android + ;; + *) + basic_machine=$field1-$field2 + os=$field3 + ;; + esac ;; - -psos*) - os=-psos + *-*) + # A lone config we happen to match not fitting any patern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + os= + ;; + *) + basic_machine=$field1 + os=$field2 + ;; + esac + ;; + esac ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + os=bsd + ;; + a29khif) + basic_machine=a29k-amd + os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=scout + ;; + alliant) + basic_machine=fx80-alliant + os= + ;; + altos | altos3068) + basic_machine=m68k-altos + os= + ;; + am29k) + basic_machine=a29k-none + os=bsd + ;; + amdahl) + basic_machine=580-amdahl + os=sysv + ;; + amiga) + basic_machine=m68k-unknown + os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=bsd + ;; + aros) + basic_machine=i386-pc + os=aros + ;; + aux) + basic_machine=m68k-apple + os=aux + ;; + balance) + basic_machine=ns32k-sequent + os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=linux + ;; + cegcc) + basic_machine=arm-unknown + os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=bsd + ;; + convex-c2) + basic_machine=c2-convex + os=bsd + ;; + convex-c32) + basic_machine=c32-convex + os=bsd + ;; + convex-c34) + basic_machine=c34-convex + os=bsd + ;; + convex-c38) + basic_machine=c38-convex + os=bsd + ;; + cray) + basic_machine=j90-cray + os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + os= + ;; + da30) + basic_machine=m68k-da30 + os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + os= + ;; + delta88) + basic_machine=m88k-motorola + os=sysv3 + ;; + dicos) + basic_machine=i686-pc + os=dicos + ;; + djgpp) + basic_machine=i586-pc + os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=ose + ;; + gmicro) + basic_machine=tron-gmicro + os=sysv + ;; + go32) + basic_machine=i386-pc + os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=hms + ;; + harris) + basic_machine=m88k-harris + os=sysv3 + ;; + hp300) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=hpux + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=proelf + ;; + i386mach) + basic_machine=i386-mach + os=mach + ;; + vsta) + basic_machine=i386-pc + os=vsta + ;; + isi68 | isi) + basic_machine=m68k-isi + os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + os=sysv + ;; + merlin) + basic_machine=ns32k-utek + os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + os=coff + ;; + morphos) + basic_machine=powerpc-unknown + os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=moxiebox + ;; + msdos) + basic_machine=i386-pc + os=msdos + ;; + msys) + basic_machine=i686-pc + os=msys + ;; + mvs) + basic_machine=i370-ibm + os=mvs + ;; + nacl) + basic_machine=le32-unknown + os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=newsos + ;; + news1000) + basic_machine=m68030-sony + os=newsos + ;; + necv70) + basic_machine=v70-nec + os=sysv + ;; + nh3000) + basic_machine=m68k-harris + os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=cxux + ;; + nindy960) + basic_machine=i960-intel + os=nindy + ;; + mon960) + basic_machine=i960-intel + os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=ose + ;; + os68k) + basic_machine=m68k-none + os=os68k + ;; + paragon) + basic_machine=i860-intel + os=osf + ;; + parisc) + basic_machine=hppa-unknown + os=linux + ;; + pw32) + basic_machine=i586-unknown + os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=rdos + ;; + rdos32) + basic_machine=i386-pc + os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=coff + ;; + sa29200) + basic_machine=a29k-amd + os=udi + ;; + sei) + basic_machine=mips-sei + os=seiux + ;; + sequent) + basic_machine=i386-sequent + os= + ;; + sps7) + basic_machine=m68k-bull + os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + os= + ;; + stratus) + basic_machine=i860-stratus + os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + os= + ;; + sun2os3) + basic_machine=m68000-sun + os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + os= + ;; + sun3os3) + basic_machine=m68k-sun + os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + os= + ;; + sun4os3) + basic_machine=sparc-sun + os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + os= + ;; + sv1) + basic_machine=sv1-cray + os=unicos + ;; + symmetry) + basic_machine=i386-sequent + os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=unicos + ;; + t90) + basic_machine=t90-cray + os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + os=tpf + ;; + udi29k) + basic_machine=a29k-amd + os=udi + ;; + ultra3) + basic_machine=a29k-nyu + os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=none + ;; + vaxv) + basic_machine=vax-dec + os=sysv + ;; + vms) + basic_machine=vax-dec + os=vms + ;; + vxworks960) + basic_machine=i960-wrs + os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=vxworks + ;; + xbox) + basic_machine=i686-pc + os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + os=unicos + ;; + *) + basic_machine=$1 + os= + ;; + esac ;; esac -# Decode aliases for certain CPU-COMPANY combinations. +# Decode 1-component or ad-hoc basic machines case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + op50n) + cpu=hppa1.1 + vendor=oki ;; - ms1) - basic_machine=mt-unknown + op60c) + cpu=hppa1.1 + vendor=oki ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown + ibm*) + cpu=i370 + vendor=ibm ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none + orion105) + cpu=clipper + vendor=highlevel ;; - xscaleeb) - basic_machine=armeb-unknown + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple ;; - - xscaleel) - basic_machine=armel-unknown + pmac | pmac-mpw) + cpu=powerpc + vendor=apple ;; - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos + cpu=m68k + vendor=motorola ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + dpx2*) + cpu=m68k + vendor=bull + os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + os=${os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=solaris2 ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta + j90 | j90-cray) + cpu=j90 + vendor=cray + os=${os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi + cpu=mips + vendor=sgi case $os in - -irix*) + irix*) ;; *) - os=-irix4 + os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs + cpu=m68000 + vendor=convergent ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv + cpu=mips + vendor=sony + os=newsos ;; - next | m*-next ) - basic_machine=m68k-next + next | m*-next) + cpu=m68k + vendor=next case $os in - -nextstep* ) + nextstep* ) ;; - -ns2*) - os=-nextstep2 + ns2*) + os=nextstep2 ;; *) - os=-nextstep3 + os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 + cpu=m68k + vendor=tti ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + pc532) + cpu=ns32k + vendor=pc532 ;; pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm + cpu=pn + vendor=gould ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + power) + cpu=power + vendor=ibm ;; ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff + cpu=i386 + vendor=ibm ;; rm[46]00) - basic_machine=mips-siemens + cpu=mips + vendor=siemens ;; rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm + cpu=romp + vendor=ibm ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi + sde) + cpu=mipsisa32 + vendor=sde + os=${os:-elf} ;; - sb1) - basic_machine=mipsisa64sb1-unknown + simso-wrs) + cpu=sparclite + vendor=wrs + os=vxworks ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown + tower | tower-32) + cpu=m68k + vendor=ncr ;; - sde) - basic_machine=mipsisa32-sde - os=-elf + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu ;; - sei) - basic_machine=mips-sei - os=-seiux + w65) + cpu=w65 + vendor=wdc ;; - sequent) - basic_machine=i386-sequent + w89k-*) + cpu=hppa1.1 + vendor=winbond + os=proelf ;; - sh) - basic_machine=sh-hitachi - os=-hms + none) + cpu=none + vendor=none ;; - sh5el) - basic_machine=sh5le-unknown + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine ;; - sh64) - basic_machine=sh64-unknown + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks + + *-*) + IFS="-" read -r cpu vendor <&2 - exit 1 + # Recognize the cannonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv64 \ + | rl78 | romp | rs6000 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | visium \ + | wasm32 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1340,197 +1270,246 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if [ x$os != x ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + # First match some system type aliases that might get confused + # with valid system types. + # solaris* is a basic system type, with this one exception. + auroraux) + os=auroraux ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` + bluegene*) + os=cnk ;; - -solaris) - os=-solaris2 + solaris1 | solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - -svr4*) - os=-sysv4 + solaris) + os=solaris2 ;; - -unixware*) - os=-sysv4.2uw + unixware*) + os=sysv4.2uw ;; - -gnu/linux*) + gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # es1800 is here to avoid being matched by es* (a different OS) + es1800*) + os=ose + ;; + # Some version numbers need modification + chorusos*) + os=chorusos + ;; + isc) + os=isc2.2 + ;; + sco6) + os=sco5v6 + ;; + sco5) + os=sco3.2v5 + ;; + sco4) + os=sco3.2v4 + ;; + sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + ;; + sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + scout) + # Don't match below + ;; + sco*) + os=sco3.2v2 + ;; + psos*) + os=psos + ;; + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + # Each alternative MUST end in a * to match a version number. + # sysv* is not here because it comes later, after sysvr4. + gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | kopensolaris* | plan9* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | knetbsd* | mirbsd* | netbsd* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* \ + | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ + | linux-newlib* | linux-musl* | linux-uclibc* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* \ + | morphos* | superux* | rtmk* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) + qnx*) + case $cpu in + x86 | i*86) ;; *) - os=-nto$os + os=nto-$os ;; esac ;; - -nto-qnx*) + hiux*) + os=hiuxwe2 ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` + nto-qnx*) ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + sim | xray | os68k* | v88r* \ + | windows* | osx | abug | netware* | os9* \ + | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) ;; - -linux-dietlibc) - os=-linux-dietlibc + linux-dietlibc) + os=linux-dietlibc ;; - -linux*) + linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + lynx*178) + os=lynxos178 + ;; + lynx*5) + os=lynxos5 + ;; + lynx*) + os=lynxos ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + mac*) + os=`echo "$os" | sed -e 's|mac|macos|'` ;; - -opened*) - os=-openedition + opened*) + os=openedition ;; - -os400*) - os=-os400 + os400*) + os=os400 ;; - -wince*) - os=-wince + sunos5*) + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - -osfrose*) - os=-osfrose + sunos6*) + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - -osf*) - os=-osf + wince*) + os=wince ;; - -utek*) - os=-bsd + utek*) + os=bsd ;; - -dynix*) - os=-bsd + dynix*) + os=bsd ;; - -acis*) - os=-aos + acis*) + os=aos ;; - -atheos*) - os=-atheos + atheos*) + os=atheos ;; - -syllable*) - os=-syllable + syllable*) + os=syllable ;; - -386bsd) - os=-bsd + 386bsd) + os=bsd ;; - -ctix* | -uts*) - os=-sysv + ctix* | uts*) + os=sysv ;; - -nova*) - os=-rtmk-nova + nova*) + os=rtmk-nova ;; - -ns2 ) - os=-nextstep2 + ns2) + os=nextstep2 ;; - -nsk*) - os=-nsk + nsk*) + os=nsk ;; # Preserve the version number of sinix5. - -sinix5.*) + sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; - -sinix*) - os=-sysv4 + sinix*) + os=sysv4 ;; - -tpf*) - os=-tpf + tpf*) + os=tpf ;; - -triton*) - os=-sysv3 + triton*) + os=sysv3 ;; - -oss*) - os=-sysv3 + oss*) + os=sysv3 ;; - -svr4) - os=-sysv4 + svr4*) + os=sysv4 ;; - -svr3) - os=-sysv3 + svr3) + os=sysv3 ;; - -sysvr4) - os=-sysv4 + sysvr4) + os=sysv4 ;; - # This must come after -sysvr4. - -sysv*) + # This must come after sysvr4. + sysv*) ;; - -ose*) - os=-ose + ose*) + os=ose ;; - -es1800*) - os=-ose + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + os=mint ;; - -xenix) - os=-xenix + zvmoe) + os=zvmoe ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + dicos*) + os=dicos ;; - -aros*) - os=-aros + pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $cpu in + arm*) + os=eabi + ;; + *) + os=elf + ;; + esac ;; - -zvmoe) - os=-zvmoe + nacl*) ;; - -dicos*) - os=-dicos + ios) ;; - -nacl*) + none) ;; - -none) + *-eabi) ;; *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1546,261 +1525,265 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +case $cpu-$vendor in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + os=linux ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; - *-be) - os=-beos + pru-*) + os=elf ;; - *-haiku) - os=-haiku + *-be) + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; - *-next ) - os=-nextstep + *-next) + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac fi # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) +case $vendor in + unknown) case $os in - -riscix*) + riscix*) vendor=acorn ;; - -sunos*) + sunos*) vendor=sun ;; - -cnk*|-aix*) + cnk*|-aix*) vendor=ibm ;; - -beos*) + beos*) vendor=be ;; - -hpux*) + hpux*) vendor=hp ;; - -mpeix*) + mpeix*) vendor=hp ;; - -hiux*) + hiux*) vendor=hitachi ;; - -unos*) + unos*) vendor=crds ;; - -dgux*) + dgux*) vendor=dg ;; - -luna*) + luna*) vendor=omron ;; - -genix*) + genix*) vendor=ns ;; - -mvs* | -opened*) + clix*) + vendor=intergraph + ;; + mvs* | opened*) vendor=ibm ;; - -os400*) + os400*) vendor=ibm ;; - -ptx*) + ptx*) vendor=sequent ;; - -tpf*) + tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + vxsim* | vxworks* | windiss*) vendor=wrs ;; - -aux*) + aux*) vendor=apple ;; - -hms*) + hms*) vendor=hitachi ;; - -mpw* | -macos*) + mpw* | macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) vendor=atari ;; - -vos*) + vos*) vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$cpu-$vendor-$os" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/configure b/configure index 8df1ba9..eeb8d45 100755 --- a/configure +++ b/configure @@ -651,6 +651,7 @@ MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE CPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -678,7 +679,6 @@ am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -743,6 +743,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -761,7 +762,8 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -770,6 +772,7 @@ enable_shared enable_static with_pic enable_fast_install +with_aix_soname enable_dependency_tracking with_gnu_ld with_sysroot @@ -822,6 +825,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS +LT_SYS_LIBRARY_PATH CPP' @@ -861,6 +865,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1113,6 +1118,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1250,7 +1264,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1403,6 +1417,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1475,17 +1490,20 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --with-geo-ip-includes=DIR Maxmind geoip include directory --with-geo-ip-libraries=DIR Maxmind geoip library directory --with-macs-vendors-include=DIR librb_macs_vendors include directory --with-macs-vendors-libraries=DIR librb_macs_vendors library directory --with-rdkafka-includes=DIR rdkafka include directory - --with-rdkfaka-libraries=DIR rdkafka library directory + --with-rdkafka-libraries=DIR rdkafka library directory --with-rd-includes=DIR rd include directory - --with-rdkfaka-libraries=DIR rd library directory + --with-rdkafka-libraries=DIR rd library directory --with-libpcap-includes=DIR libpcap include directory --with-libpcap-libraries=DIR libpcap library directory --with-libpfring-includes=DIR libpfring include directory @@ -1511,6 +1529,8 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CPP C preprocessor Use these variables to override the choices made by `configure' or to help @@ -2531,7 +2551,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h" -am__api_version='1.15' +am__api_version='1.16' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -3077,8 +3097,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -3129,7 +3149,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3150,8 +3170,8 @@ esac -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -3165,7 +3185,7 @@ macro_revision='1.3337' -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -3285,7 +3305,7 @@ func_echo_all () $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -3311,45 +3331,45 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -4647,19 +4667,19 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -4673,7 +4693,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; } while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -4684,7 +4704,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; } with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -4695,32 +4715,32 @@ if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -4763,33 +4783,38 @@ if ${lt_cv_path_NM+:} false; then : else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -4800,15 +4825,15 @@ else esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -4914,9 +4939,9 @@ esac fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -4924,8 +4949,8 @@ fi esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -4976,7 +5001,7 @@ if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -5016,7 +5041,7 @@ else lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5066,22 +5091,23 @@ else ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -5099,7 +5125,7 @@ else fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -5117,30 +5143,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -5263,13 +5265,13 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -5397,13 +5399,13 @@ lt_cv_deplibs_check_method='unknown' # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -5430,8 +5432,7 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -5467,10 +5468,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5509,7 +5506,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -5531,8 +5528,8 @@ newos6*) lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -5585,6 +5582,9 @@ sysv4 | sysv4.3*) tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -5742,8 +5742,8 @@ else case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -5755,7 +5755,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -5910,7 +5910,7 @@ if ac_fn_c_try_compile "$LINENO"; then : ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -5918,7 +5918,7 @@ if ac_fn_c_try_compile "$LINENO"; then : ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -5931,7 +5931,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -6148,7 +6148,7 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -6238,7 +6238,7 @@ cygwin* | mingw* | pw32* | cegcc*) symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -6271,14 +6271,44 @@ case `$NM -V 2>&1` in symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6296,21 +6326,24 @@ for ac_symprfx in "" "_"; do # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -6358,11 +6391,11 @@ _LT_EOF if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -6388,7 +6421,7 @@ lt__PROGRAM__LTX_preloaded_symbols[] = { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -6408,13 +6441,13 @@ _LT_EOF mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -6435,7 +6468,7 @@ _LT_EOF rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -6477,6 +6510,16 @@ fi + + + + + + + + + + @@ -6500,9 +6543,9 @@ fi lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -6512,8 +6555,8 @@ case ${with_sysroot} in #( no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -6525,18 +6568,99 @@ $as_echo "${lt_sysroot:-no}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6545,24 +6669,25 @@ ia64-*-hpux*) test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -6591,9 +6716,50 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6607,9 +6773,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6628,7 +6804,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -6646,7 +6825,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -6686,13 +6865,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6704,7 +6884,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -6713,7 +6893,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -6729,7 +6909,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -6840,7 +7020,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -7343,7 +7523,7 @@ if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -7361,7 +7541,7 @@ else cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7400,7 +7580,7 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -7429,7 +7609,7 @@ _LT_EOF _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7442,32 +7622,32 @@ fi $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7475,6 +7655,41 @@ $as_echo "$lt_cv_ld_force_load" >&6; } ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7778,14 +7993,14 @@ if test "${enable_shared+set}" = set; then : *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7809,14 +8024,14 @@ if test "${enable_static+set}" = set; then : *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7840,14 +8055,14 @@ if test "${with_pic+set}" = set; then : *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7855,8 +8070,6 @@ else fi -test -z "$pic_mode" && pic_mode=default - @@ -7872,14 +8085,14 @@ if test "${enable_fast_install+set}" = set; then : *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7893,11 +8106,63 @@ fi + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -7946,7 +8211,7 @@ test -z "$LN_S" && LN_S="ln -s" -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -7985,7 +8250,7 @@ aix3*) # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -7996,14 +8261,14 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -8012,15 +8277,8 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -8035,22 +8293,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then : else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8073,13 +8331,13 @@ _LT_EOF break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8101,22 +8359,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then : else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8139,13 +8397,13 @@ _LT_EOF break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8166,7 +8424,7 @@ esac # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8228,7 +8486,7 @@ if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -8244,7 +8502,7 @@ else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8274,7 +8532,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -8292,17 +8550,18 @@ lt_prog_compiler_pic= lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -8313,8 +8572,8 @@ lt_prog_compiler_static= ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -8330,6 +8589,11 @@ lt_prog_compiler_static= # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -8400,7 +8664,7 @@ lt_prog_compiler_static= case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -8408,10 +8672,29 @@ lt_prog_compiler_static= fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -8427,7 +8710,7 @@ lt_prog_compiler_static= ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -8436,9 +8719,9 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -8463,6 +8746,12 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -8560,7 +8849,7 @@ lt_prog_compiler_static= ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -8589,7 +8878,7 @@ lt_prog_compiler_static= fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -8621,7 +8910,7 @@ else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8651,7 +8940,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -8683,7 +8972,7 @@ if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -8702,13 +8991,13 @@ else fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -8828,8 +9117,8 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -8841,9 +9130,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; } ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -8886,9 +9175,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -8903,7 +9192,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -8911,7 +9200,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -8921,7 +9210,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -8943,24 +9232,24 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -8973,7 +9262,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -8992,7 +9281,7 @@ _LT_EOF case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9008,7 +9297,7 @@ _LT_EOF allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -9018,7 +9307,7 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -9026,61 +9315,89 @@ _LT_EOF exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9091,42 +9408,47 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9140,8 +9462,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9159,8 +9481,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9172,7 +9494,7 @@ _LT_EOF ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -9187,9 +9509,9 @@ _LT_EOF # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9206,15 +9528,15 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -9230,7 +9552,7 @@ _LT_EOF # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -9238,34 +9560,57 @@ _LT_EOF ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -9284,13 +9629,21 @@ _LT_EOF hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -9309,35 +9662,42 @@ _LT_EOF ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9372,7 +9732,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9380,17 +9740,17 @@ fi aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9425,7 +9785,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9433,21 +9793,33 @@ fi aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -9456,7 +9828,7 @@ fi case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9486,16 +9858,17 @@ fi # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -9504,18 +9877,18 @@ fi # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -9524,7 +9897,7 @@ fi # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -9543,24 +9916,24 @@ fi hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -9602,33 +9975,33 @@ fi ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -9636,25 +10009,25 @@ fi ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -9666,7 +10039,7 @@ if ${lt_cv_prog_compiler__b+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -9685,14 +10058,14 @@ else fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -9700,8 +10073,8 @@ fi ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -9712,7 +10085,7 @@ fi *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -9723,8 +10096,8 @@ fi ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -9734,8 +10107,8 @@ $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " > if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -9747,24 +10120,34 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -9779,7 +10162,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -9787,27 +10170,19 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -9818,33 +10193,53 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -9855,24 +10250,24 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -9882,11 +10277,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -9896,10 +10291,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -9948,43 +10343,43 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -9999,10 +10394,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -10010,7 +10405,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -10036,7 +10431,7 @@ x|xyes) # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -10251,14 +10646,14 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -10274,28 +10669,35 @@ if test "$GCC" = yes; then ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -10309,7 +10711,7 @@ BEGIN {RS=" "; FS="/|\n";} { # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -10318,7 +10720,7 @@ fi library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -10335,14 +10737,16 @@ hardcode_into_libs=no # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -10350,41 +10754,91 @@ aix[4-9]*) need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -10394,18 +10848,18 @@ amigaos*) powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -10413,8 +10867,8 @@ beos*) bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -10426,7 +10880,7 @@ bsdi[45]*) cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -10435,8 +10889,8 @@ cygwin* | mingw* | pw32* | cegcc*) # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -10452,17 +10906,17 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -10471,8 +10925,8 @@ cygwin* | mingw* | pw32* | cegcc*) *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -10499,7 +10953,7 @@ cygwin* | mingw* | pw32* | cegcc*) sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -10512,8 +10966,8 @@ cygwin* | mingw* | pw32* | cegcc*) esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -10526,7 +10980,7 @@ cygwin* | mingw* | pw32* | cegcc*) *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -10539,8 +10993,8 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -10553,8 +11007,8 @@ dgux*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -10572,12 +11026,13 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -10602,26 +11057,15 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -10639,14 +11083,15 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -10654,8 +11099,8 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -10664,8 +11109,8 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -10678,8 +11123,8 @@ interix[3-9]*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10690,7 +11135,7 @@ irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -10698,8 +11143,8 @@ irix5* | irix6* | nonstopux*) esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -10718,8 +11163,8 @@ irix5* | irix6* | nonstopux*) esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -10728,13 +11173,33 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10781,11 +11246,15 @@ fi # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10802,12 +11271,12 @@ netbsd*) need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -10817,7 +11286,7 @@ netbsd*) newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -10826,58 +11295,68 @@ newsos6) version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -10888,8 +11367,8 @@ solaris*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -10899,11 +11378,11 @@ solaris*) sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -10911,8 +11390,8 @@ sunos4*) sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -10933,24 +11412,24 @@ sysv4 | sysv4.3*) ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -10968,7 +11447,7 @@ tpf*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -10976,8 +11455,8 @@ tpf*) uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -10987,20 +11466,35 @@ uts4*) esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -11097,15 +11591,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -11120,12 +11614,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -11135,7 +11629,7 @@ fi - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -11145,23 +11639,23 @@ else case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -11199,10 +11693,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -11210,10 +11704,18 @@ fi ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -11252,11 +11754,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -11295,7 +11797,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -11334,7 +11836,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -11373,7 +11875,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -11394,21 +11896,21 @@ fi ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -11416,7 +11918,7 @@ $as_echo_n "checking whether a program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11463,9 +11965,9 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11495,7 +11997,7 @@ _LT_EOF (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11515,14 +12017,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11569,9 +12071,9 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11601,7 +12103,7 @@ _LT_EOF (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11622,9 +12124,9 @@ fi $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -11668,7 +12170,7 @@ else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -11696,7 +12198,7 @@ fi - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -11704,13 +12206,13 @@ $as_echo "$can_build_shared" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -11718,8 +12220,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -11729,7 +12235,7 @@ $as_echo "$enable_shared" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -11743,7 +12249,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC @@ -17322,7 +17828,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -17338,6 +17844,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -17387,10 +17894,13 @@ compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -17455,7 +17965,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -17506,9 +18017,12 @@ CFLAGS \ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -17543,7 +18057,7 @@ old_striplib \ striplib; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17570,10 +18084,11 @@ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec; do +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17582,19 +18097,16 @@ sys_lib_dlsearch_path_spec; do done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -18222,29 +18734,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -18262,106 +18780,101 @@ $as_echo X"$mf" | q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="" +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -18381,6 +18894,9 @@ pic_mode=$pic_mode # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -18498,18 +19014,27 @@ global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -18600,8 +19125,11 @@ hardcode_into_libs=$hardcode_into_libs # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -18694,13 +19222,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -18750,6 +19278,65 @@ hardcode_action=$hardcode_action # ### END LIBTOOL CONFIG +_LT_EOF + + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + _LT_EOF case $host_os in @@ -18758,7 +19345,7 @@ _LT_EOF # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -18767,7 +19354,7 @@ _LT_EOF esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -18777,165 +19364,6 @@ ltmain="$ac_aux_dir/ltmain.sh" sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" diff --git a/configure.in b/configure.in index e39b365..9f995ce 100644 --- a/configure.in +++ b/configure.in @@ -214,7 +214,7 @@ AC_ARG_WITH(rdkafka_includes, [with_rdkafka_includes="$withval"],[with_rdkafka_includes="no"]) AC_ARG_WITH(rdkafka_libraries, - [ --with-rdkfaka-libraries=DIR rdkafka library directory], + [ --with-rdkafka-libraries=DIR rdkafka library directory], [with_rdkafka_libraries="$withval"],[with_rdkafka_libraries="no"]) if test "x$with_rdkafka_includes" != "xno"; then @@ -272,7 +272,7 @@ AC_ARG_WITH(rd_includes, [with_rd_includes="$withval"],[with_rd_includes="no"]) AC_ARG_WITH(rd_libraries, - [ --with-rdkfaka-libraries=DIR rd library directory], + [ --with-rdkafka-libraries=DIR rd library directory], [with_rd_libraries="$withval"],[with_rd_libraries="no"]) if test "x$with_rd_includes" != "xno"; then diff --git a/configure.sh b/configure.sh index c2be093..dfc8c16 100755 --- a/configure.sh +++ b/configure.sh @@ -1 +1 @@ -./configure --prefix=/ --sbindir=/usr/sbin --exec-prefix=/ --enable-ipv6 --enable-geo-ip --enable-kafka --with-rdkafka-includes=/usr/include --with-rdkafka-libraries=/usr/lib --with-macs-vendors-includes=/usr/include --with-macs-vendors-libraries=/usr/lib64 --enable-rb-macs-vendors --enable-rb-http --enable-debug +./configure --prefix=/ --sbindir=/usr/sbin --exec-prefix=/ --enable-ipv6 --enable-geo-ip --enable-kafka --with-rdkafka-includes=/usr/include --with-rdkafka-libraries=/usr/lib --with-macs-vendors-includes=/usr/include --with-macs-vendors-libraries=/usr/lib64 --enable-rb-macs-vendors --enable-rb-http --enable-debug --enable-extradata diff --git a/doc/Makefile.in b/doc/Makefile.in index 0d3e155..72a7bcb 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -113,7 +113,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -172,6 +172,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -243,6 +244,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -273,8 +275,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -298,7 +300,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/etc/Makefile.in b/etc/Makefile.in index 7b24f6c..b543008 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -113,7 +113,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -172,6 +172,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -243,6 +244,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -273,8 +275,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -298,7 +300,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/install-sh b/install-sh index 0b0fdcb..20d8b2e 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2013-12-25.23; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ do fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -324,34 +332,43 @@ do # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; @@ -427,14 +444,25 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -493,9 +521,9 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/ltmain.sh b/ltmain.sh index 63ae69d..7f3523d 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES 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, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" + +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -dirname="s,/[^/]*$,," -basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation +## ----------------- ## +## Global variables. ## +## ----------------- ## -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' +## ----------------- ## +## Standard options. ## +## ----------------- ## -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : -} +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## -------------------- ## +## Resource management. ## +## -------------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () { - func_error ${1+"$@"} - exit $EXIT_FAILURE -} + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" + require_term_colors=: } -help="Try \`$progname --help' for more information." ## default -# func_grep expression filename +## ----------------- ## +## Function library. ## +## ----------------- ## + +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. + + +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. + + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd + + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + _G_directory_path=$1 + _G_dir_list= - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then + + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ - save_mktempdir_umask=`umask` + func_mktempdir_umask=`umask` umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask fi # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result fi - $ECHO "$my_tmpdir" + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) 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, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd + + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} + + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} + + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + $debug_cmd + + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () + +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + + func_usage_message + $ECHO "$long_help_message + +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func_fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ func_config () exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,314 +2170,350 @@ func_features () exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" + + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () { - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done + $debug_cmd - # Validate options: + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; + + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift + ## ----------- ## ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ func_lalib_unsafe_p () for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ func_lalib_unsafe_p () # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ func_ltwrapper_scriptname () { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ func_ltwrapper_p () # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ func_execute_cmds () # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ func_resolve_sysroot () # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ func_replace_sysroot () # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ func_infer_tag () for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ func_infer_tag () # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ func_infer_tag () # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ func_write_libtool_object () $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ func_convert_core_file_wine_to_w32 () # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ func_convert_core_path_wine_to_w32 () # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ func_cygpath () fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ func_cygpath () # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ func_convert_core_msys_to_w32 () # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ func_convert_file_check () # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_convert_path_check () func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ func_convert_path_check () # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ func_convert_path_front_back_pathsep () ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ func_convert_path_front_back_pathsep () # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ func_to_host_file () # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ func_to_tool_file () # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ func_convert_file_noop () # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ func_convert_file_msys_to_w32 () # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ func_convert_file_cygwin_to_w32 () # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ func_convert_file_nix_to_w32 () # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ func_convert_file_msys_to_cygwin () # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ func_convert_file_nix_to_cygwin () ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ func_convert_file_nix_to_cygwin () to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ func_init_to_host_path_cmd () # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ func_to_host_path () # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ func_convert_path_noop () # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_convert_path_msys_to_w32 () func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ func_convert_path_msys_to_w32 () # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ func_convert_path_cygwin_to_w32 () # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ func_convert_path_nix_to_w32 () # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ func_convert_path_msys_to_cygwin () # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_convert_path_nix_to_cygwin () func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ func_convert_path_nix_to_cygwin () # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ func_mode_compile () case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ func_mode_compile () case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_mode_compile () func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ func_mode_compile () # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_mode_compile () func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ func_mode_compile () case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ func_mode_compile () for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_mode_compile () func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ func_mode_compile () pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ func_mode_compile () # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ func_mode_compile () This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ compiler." qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ compiler." func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ $srcfile This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ compiler." fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ compiler." func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ $srcfile This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ compiler." func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ compiler." } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ func_mode_help () Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ This mode accepts the following additional options: -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ This mode accepts the following additional options: -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Complete the installation of libtool libraries. Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ the \`--dry-run' option if you just want to see what would be executed." Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ The following components of LINK-COMMAND are treated specially: -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ The following components of LINK-COMMAND are treated specially: -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ The following components of LINK-COMMAND are treated specially: -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ is created, otherwise an executable program is created." Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ Otherwise, only FILE itself is deleted using RM." ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ if $opt_help; then for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ if $opt_help; then func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ fi # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ func_mode_execute () # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ func_mode_execute () if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ func_mode_execute () *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ func_mode_execute () # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ func_mode_execute () if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_mode_execute () func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ func_mode_execute () done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ func_mode_finish () if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ func_mode_finish () # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ func_mode_finish () fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ func_mode_finish () echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ func_mode_finish () exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ func_mode_install () opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ func_mode_install () fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ func_mode_install () *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_mode_install () func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ func_mode_install () dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ func_mode_install () case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ func_mode_install () # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ func_mode_install () # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ func_mode_install () fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ func_mode_install () # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ func_mode_install () relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ func_mode_install () if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ func_mode_install () fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ func_mode_install () # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ func_mode_install () staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_mode_install () func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ func_mode_install () *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ func_mode_install () # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_mode_install () func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ func_mode_install () for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ func_mode_install () done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ test "$opt_mode" = install && func_mode_install ${1+"$@"} # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ func_generate_dlsyms () "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_generate_dlsyms () func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ extern \"C\" { progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ extern \"C\" { # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ extern \"C\" { } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ extern \"C\" { fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ extern \"C\" { fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ extern \"C\" { echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ typedef struct { void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ static const void *lt_preloaded_setup() { *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ static const void *lt_preloaded_setup() { func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ static const void *lt_preloaded_setup() { esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ static const void *lt_preloaded_setup() { fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ static const void *lt_preloaded_setup() { # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ func_win32_libid () # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ func_win32_libid () # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ func_cygming_dll_for_implib () # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ func_cygming_dll_for_implib_fallback_core () /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5053,6 @@ func_cygming_dll_for_implib_fallback_core () $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5066,17 @@ func_cygming_ms_implib_p () # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ func_cygming_dll_for_implib_fallback () # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ func_extract_an_archive () fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ func_extract_an_archive () # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ func_extract_archives () esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ func_extract_archives () cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ func_extract_archives () my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ func_extract_archives () # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ func_emit_wrapper () #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ _LTECHO_EOF' # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ func_parse_lt_options () # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ func_lt_dump_args () lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ func_exec_program_core () *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ func_exec_program_core () *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ func_exec_program () test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ func_exec_program () if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ func_exec_program () fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ func_exec_program () fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ func_emit_cwrapperexe_src () cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ int setenv (const char *, const char *, int); # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ int setenv (const char *, const char *, int); #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ void lt_dump_script (FILE *f); EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ EOF # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ func_mode_link () module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ func_mode_link () vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ func_mode_link () do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ func_mode_link () # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ func_mode_link () case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ func_mode_link () continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ func_mode_link () continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ func_mode_link () esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ func_mode_link () continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ func_mode_link () if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ func_mode_link () fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ func_mode_link () # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ func_mode_link () if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_mode_link () func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_mode_link () func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ func_mode_link () continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ func_mode_link () esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ func_mode_link () -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ func_mode_link () if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_mode_link () func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ func_mode_link () *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ func_mode_link () ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ func_mode_link () ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ func_mode_link () ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ func_mode_link () continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ func_mode_link () ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ func_mode_link () *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ func_mode_link () continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_mode_link () func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_mode_link () func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ func_mode_link () # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,48 @@ func_mode_link () # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7329,21 @@ func_mode_link () if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7354,7 @@ func_mode_link () fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7362,23 @@ func_mode_link () # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7386,7 @@ func_mode_link () if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7394,7 @@ func_mode_link () func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7410,11 @@ func_mode_link () # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7429,7 @@ func_mode_link () # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7441,9 @@ func_mode_link () done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7452,23 @@ func_mode_link () oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7491,7 @@ func_mode_link () # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7499,7 @@ func_mode_link () func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7531,7 @@ func_mode_link () case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7539,7 @@ func_mode_link () prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7551,29 @@ func_mode_link () for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7594,26 @@ func_mode_link () esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7623,13 @@ func_mode_link () continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7637,22 @@ func_mode_link () for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7660,19 @@ func_mode_link () old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7681,25 @@ func_mode_link () *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7712,18 @@ func_mode_link () case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7734,13 @@ func_mode_link () func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7758,7 @@ func_mode_link () lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7769,26 @@ func_mode_link () case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7796,13 @@ func_mode_link () echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7813,10 @@ func_mode_link () esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7829,20 @@ func_mode_link () continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7872,30 @@ func_mode_link () done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7909,26 @@ func_mode_link () # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7942,40 @@ func_mode_link () # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7984,11 @@ func_mode_link () name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8032,9 @@ func_mode_link () if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8044,14 @@ func_mode_link () fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8063,14 @@ func_mode_link () ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8080,15 @@ func_mode_link () continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8117,9 @@ func_mode_link () esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8128,19 @@ func_mode_link () link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8150,24 @@ func_mode_link () # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8195,43 @@ func_mode_link () # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8239,58 @@ func_mode_link () linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8299,10 @@ func_mode_link () ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8310,7 @@ func_mode_link () *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8320,15 @@ func_mode_link () *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8337,33 @@ func_mode_link () fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8372,10 @@ func_mode_link () ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8383,43 @@ func_mode_link () test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8432,11 @@ func_mode_link () fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8450,12 @@ func_mode_link () *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8465,7 @@ func_mode_link () func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8474,12 @@ func_mode_link () func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8487,12 @@ func_mode_link () dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8500,35 @@ func_mode_link () case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7095,23 +8540,23 @@ func_mode_link () fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8566,12 @@ func_mode_link () esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8629,93 @@ func_mode_link () eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8724,10 @@ func_mode_link () eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8741,8 @@ func_mode_link () esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8751,21 @@ func_mode_link () fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8774,20 @@ func_mode_link () fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8795,42 @@ func_mode_link () case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8838,30 @@ func_mode_link () case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8876,36 @@ func_mode_link () # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8916,74 @@ func_mode_link () nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8997,45 @@ func_mode_link () verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9044,8 @@ func_mode_link () case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9061,11 @@ func_mode_link () fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9086,13 @@ func_mode_link () *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9102,7 @@ func_mode_link () done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9111,7 @@ func_mode_link () esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9135,7 @@ func_mode_link () ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9151,9 @@ func_mode_link () # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9182,20 @@ EOF -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9225,20 @@ EOF $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9275,24 @@ EOF -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9310,25 @@ EOF # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9336,7 @@ EOF echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9359,30 @@ EOF -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9390,7 @@ EOF echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9406,18 @@ EOF done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9441,8 @@ EOF ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9451,12 @@ EOF if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9467,14 @@ EOF echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9520,7 @@ EOF *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9528,25 @@ EOF dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9571,7 @@ EOF # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9585,8 @@ EOF test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9596,19 @@ EOF eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9622,7 @@ EOF delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9631,31 @@ EOF cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8175,7 +9669,7 @@ EOF try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9680,7 @@ EOF output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8209,8 +9703,8 @@ EOF break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9712,16 @@ EOF fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9740,11 @@ EOF ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9755,7 @@ EOF eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9764,18 @@ EOF fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9793,7 @@ EOF fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9826,8 @@ EOF last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9839,14 @@ EOF func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9861,7 @@ EOF else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9873,13 @@ EOF func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9889,10 @@ EOF reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9904,9 @@ EOF # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9914,9 @@ EOF output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9925,16 @@ EOF if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9942,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9951,7 @@ EOF exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9959,18 @@ EOF fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9979,7 @@ EOF export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9993,7 @@ EOF # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10015,7 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10023,12 @@ EOF test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10036,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10045,10 @@ EOF exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8573,39 +10068,39 @@ EOF done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10108,7 @@ EOF ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10121,19 @@ EOF # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10142,12 @@ EOF fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10159,7 @@ EOF exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10169,12 @@ EOF # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10191,14 @@ EOF output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10212,11 @@ EOF *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10252,7 @@ EOF *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10276,7 @@ EOF if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10299,7 @@ EOF fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10316,10 @@ EOF # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10327,7 @@ EOF if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10352,43 @@ EOF # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10401,12 @@ EOF fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10436,9 @@ EOF fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10455,28 @@ EOF exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10533,8 @@ EOF func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10555,7 @@ EOF trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10578,27 @@ EOF # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10606,13 @@ EOF fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10633,7 @@ EOF : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10642,7 @@ EOF for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10711,18 @@ EOF else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10739,7 @@ EOF case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10754,31 @@ EOF fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10794,23 @@ EOF *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10820,34 @@ EOF # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10863,9 @@ EOF case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10874,7 @@ EOF esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10888,7 @@ library_names='$library_names' # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10914,7 @@ dlpreopen='$dlprefiles' # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10929,29 @@ relink_command=\"$relink_command\"" exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10964,18 @@ func_mode_uninstall () for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10990,11 @@ func_mode_uninstall () elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11008,7 @@ func_mode_uninstall () done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11019,12 @@ func_mode_uninstall () uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11040,19 @@ func_mode_uninstall () func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11079,12 @@ func_mode_uninstall () # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11093,7 @@ func_mode_uninstall () func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11103,17 @@ func_mode_uninstall () exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11124,7 @@ exit $exit_status # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11147,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff --git a/m4/Makefile.in b/m4/Makefile.in index b8bbb0f..467d4d5 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -113,7 +113,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -172,6 +172,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -243,6 +244,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -275,8 +277,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -300,7 +302,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 56666f0..a644432 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ esac # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], []) dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ aix3*) # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ no_glob_subst='s/\*/\\\*/g' # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ ltmain="$ac_aux_dir/ltmain.sh" # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ m4_define([_lt_decl_all_varnames], # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -446,7 +456,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ _LT_OUTPUT_LIBTOOL_INIT # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -598,7 +608,7 @@ AS_SHELL_SANITIZE _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ exec AS_MESSAGE_LOG_FD>>config.log } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ do lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ chmod +x "$CONFIG_LT" # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,32 +715,47 @@ m4_defun([_LT_CONFIG], _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS # ### END LIBTOOL CONFIG +_LT_EOF + + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + _LT_EOF case $host_os in @@ -739,7 +764,7 @@ _LT_EOF # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +781,6 @@ _LT_EOF sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -775,7 +798,6 @@ _LT_EOF [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +996,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1014,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1032,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1054,7 @@ _LT_EOF _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1064,32 @@ _LT_EOF ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1109,29 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1151,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1169,7 @@ else _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1189,8 @@ m4_define([_LT_SHELL_INIT], # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1218,10 @@ fi # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1247,17 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1267,14 @@ case ${with_sysroot} in #( no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1282,33 @@ m4_defun([_LT_ENABLE_LOCK], [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1337,46 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1324,9 +1386,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1417,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1363,19 +1438,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1383,7 +1459,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1392,7 +1468,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1408,7 +1484,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1427,11 +1503,11 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1439,7 +1515,7 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1470,7 +1546,7 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1506,7 +1582,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1533,7 +1609,7 @@ AC_CACHE_CHECK([$1], [$2], $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1555,7 +1631,7 @@ AC_DEFUN([_LT_LINKER_OPTION], m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1574,10 +1650,10 @@ AC_CACHE_CHECK([$1], [$2], fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1598,7 +1674,7 @@ AC_DEFUN([LT_CMD_MAX_LEN], AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1638,7 +1714,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1688,22 +1764,23 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1719,7 +1796,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1747,7 +1824,7 @@ m4_defun([_LT_HEADER_DLFCN], # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1794,9 +1871,9 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1822,7 +1899,7 @@ int main () return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1843,7 +1920,7 @@ rm -fr conftest* # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1853,44 +1930,52 @@ else case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1899,21 +1984,21 @@ else ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1923,7 +2008,7 @@ else lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1933,9 +2018,9 @@ else ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2027,8 +2112,8 @@ m4_defun([_LT_COMPILER_FILE_LOCKS], m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2038,8 +2123,8 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2066,8 +2151,8 @@ objdir=$lt_cv_objdir _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2079,15 +2164,15 @@ m4_defun([_LT_LINKER_HARDCODE_LIBPATH], _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2101,12 +2186,12 @@ else fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2130,7 +2215,7 @@ else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2148,6 +2233,47 @@ _LT_DECL([], [striplib], [1]) ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2158,17 +2284,18 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2184,28 +2311,35 @@ if test "$GCC" = yes; then ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2219,7 +2353,7 @@ BEGIN {RS=" "; FS="/|\n";} { # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2228,7 +2362,7 @@ fi]) library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2245,14 +2379,17 @@ hardcode_into_libs=no # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2260,41 +2397,91 @@ aix[[4-9]]*) need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2304,18 +2491,18 @@ amigaos*) powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2323,8 +2510,8 @@ beos*) bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2336,7 +2523,7 @@ bsdi[[45]]*) cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2345,8 +2532,8 @@ cygwin* | mingw* | pw32* | cegcc*) # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2362,17 +2549,17 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2381,8 +2568,8 @@ m4_if([$1], [],[ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2409,7 +2596,7 @@ m4_if([$1], [],[ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2422,8 +2609,8 @@ m4_if([$1], [],[ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2436,7 +2623,7 @@ m4_if([$1], [],[ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2449,8 +2636,8 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2463,8 +2650,8 @@ dgux*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2482,12 +2669,13 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2512,26 +2700,15 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2549,14 +2726,15 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2564,8 +2742,8 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2574,8 +2752,8 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2588,8 +2766,8 @@ interix[[3-9]]*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2600,7 +2778,7 @@ irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2608,8 +2786,8 @@ irix5* | irix6* | nonstopux*) esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2628,8 +2806,8 @@ irix5* | irix6* | nonstopux*) esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2638,13 +2816,33 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2672,11 +2870,15 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2693,12 +2895,12 @@ netbsd*) need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2708,7 +2910,7 @@ netbsd*) newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2717,58 +2919,68 @@ newsos6) version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2779,8 +2991,8 @@ solaris*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2790,11 +3002,11 @@ solaris*) sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2802,8 +3014,8 @@ sunos4*) sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2824,24 +3036,24 @@ sysv4 | sysv4.3*) ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2859,7 +3071,7 @@ tpf*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2867,8 +3079,8 @@ tpf*) uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2877,20 +3089,30 @@ uts4*) ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2923,39 +3145,41 @@ _LT_DECL([], [hardcode_into_libs], [0], [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2978,11 +3202,11 @@ _LT_EOF break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3000,7 +3224,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3027,16 +3251,16 @@ m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3050,7 +3274,7 @@ if test "$GCC" = yes; then while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3061,37 +3285,37 @@ if test "$GCC" = yes; then with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3177,13 +3438,13 @@ lt_cv_deplibs_check_method='unknown' # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3210,8 +3471,7 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3247,10 +3507,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3289,7 +3545,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -3311,8 +3567,8 @@ newos6*) lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3365,6 +3621,9 @@ sysv4 | sysv4.3*) tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3405,33 +3664,38 @@ AC_DEFUN([LT_PATH_NM], AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3442,21 +3706,21 @@ else esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3464,8 +3728,8 @@ else esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3511,8 +3775,8 @@ lt_cv_sharedlib_from_linklib_cmd, case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3524,7 +3788,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3551,13 +3815,28 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3569,11 +3848,11 @@ case $host in # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3592,7 +3871,7 @@ m4_defun([_LT_COMPILER_NO_RTTI], _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3644,7 +3923,7 @@ cygwin* | mingw* | pw32* | cegcc*) symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3677,14 +3956,44 @@ case `$NM -V 2>&1` in symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3702,21 +4011,24 @@ for ac_symprfx in "" "_"; do # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3756,11 +4068,11 @@ _LT_EOF if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3786,7 +4098,7 @@ lt__PROGRAM__LTX_preloaded_symbols[[]] = { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3806,9 +4118,9 @@ _LT_EOF mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3829,7 +4141,7 @@ _LT_EOF rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3856,12 +4168,16 @@ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3877,17 +4193,18 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)= m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3898,8 +4215,8 @@ m4_if([$1], [CXX], [ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3915,6 +4232,11 @@ m4_if([$1], [CXX], [ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3964,7 +4286,7 @@ m4_if([$1], [CXX], [ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4005,14 +4327,14 @@ m4_if([$1], [CXX], [ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4041,7 +4363,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4049,7 +4371,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4194,17 +4516,18 @@ m4_if([$1], [CXX], [ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4215,8 +4538,8 @@ m4_if([$1], [CXX], [ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4233,6 +4556,11 @@ m4_if([$1], [CXX], [ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4303,7 +4631,7 @@ m4_if([$1], [CXX], [ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4311,11 +4639,30 @@ m4_if([$1], [CXX], [ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4331,7 +4678,7 @@ m4_if([$1], [CXX], [ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4340,9 +4687,9 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4367,6 +4714,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4464,7 +4817,7 @@ m4_if([$1], [CXX], [ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4493,7 +4846,7 @@ m4_if([$1], [CXX], [ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4559,17 +4912,21 @@ m4_if([$1], [CXX], [ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4615,9 +4972,9 @@ m4_if([$1], [CXX], [ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4633,7 +4990,7 @@ dnl Note also adjust exclude_expsyms for C++ above. # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4641,7 +4998,7 @@ dnl Note also adjust exclude_expsyms for C++ above. # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -4651,7 +5008,7 @@ dnl Note also adjust exclude_expsyms for C++ above. # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4673,24 +5030,24 @@ dnl Note also adjust exclude_expsyms for C++ above. esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4703,7 +5060,7 @@ dnl Note also adjust exclude_expsyms for C++ above. case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4722,7 +5079,7 @@ _LT_EOF case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4738,7 +5095,7 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4748,7 +5105,7 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4756,61 +5113,89 @@ _LT_EOF _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4821,42 +5206,47 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4870,8 +5260,8 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4889,8 +5279,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4902,7 +5292,7 @@ _LT_EOF _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4917,9 +5307,9 @@ _LT_EOF # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4936,15 +5326,15 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4960,7 +5350,7 @@ _LT_EOF # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4968,34 +5358,57 @@ _LT_EOF ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5014,13 +5427,21 @@ _LT_EOF _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5039,61 +5460,80 @@ _LT_EOF ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5102,7 +5542,7 @@ _LT_EOF case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5132,16 +5572,17 @@ _LT_EOF # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5150,18 +5591,18 @@ _LT_EOF # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5170,7 +5611,7 @@ _LT_EOF # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5220,33 +5661,33 @@ _LT_EOF ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5254,25 +5695,25 @@ _LT_EOF ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5280,14 +5721,14 @@ _LT_EOF # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5298,7 +5739,7 @@ _LT_EOF *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5309,16 +5750,16 @@ _LT_EOF ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5331,21 +5772,31 @@ _LT_EOF end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -5360,7 +5811,7 @@ _LT_EOF newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5368,27 +5819,19 @@ _LT_EOF *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5399,33 +5842,53 @@ _LT_EOF _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5436,24 +5899,24 @@ _LT_EOF solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5463,11 +5926,11 @@ _LT_EOF solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5477,10 +5940,10 @@ _LT_EOF ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5529,43 +5992,43 @@ _LT_EOF ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5580,17 +6043,17 @@ _LT_EOF ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5607,7 +6070,7 @@ x|xyes) # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5687,12 +6150,12 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5733,10 +6196,10 @@ dnl [Compiler flag to generate thread safe objects]) # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5776,18 +6239,18 @@ if test -n "$compiler"; then LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5795,8 +6258,12 @@ if test -n "$compiler"; then ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5804,13 +6271,13 @@ if test -n "$compiler"; then AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5818,14 +6285,14 @@ CC="$lt_save_CC" # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5867,7 +6334,7 @@ _LT_TAGVAR(objext, $1)=$objext # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5909,35 +6376,35 @@ if test "$_lt_caught_CXX_error" != yes; then if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5973,18 +6440,30 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -5994,6 +6473,13 @@ if test "$_lt_caught_CXX_error" != yes; then ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6012,13 +6498,21 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6036,64 +6530,84 @@ if test "$_lt_caught_CXX_error" != yes; then fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6103,7 +6617,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6131,57 +6645,58 @@ if test "$_lt_caught_CXX_error" != yes; then # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6192,6 +6707,34 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6226,18 +6769,15 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6249,7 +6789,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6258,11 +6798,11 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6272,15 +6812,15 @@ if test "$_lt_caught_CXX_error" != yes; then ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6306,13 +6846,13 @@ if test "$_lt_caught_CXX_error" != yes; then aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6323,20 +6863,20 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6351,22 +6891,22 @@ if test "$_lt_caught_CXX_error" != yes; then interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6375,22 +6915,22 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6398,8 +6938,8 @@ if test "$_lt_caught_CXX_error" != yes; then # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6408,10 +6948,10 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6425,59 +6965,59 @@ if test "$_lt_caught_CXX_error" != yes; then # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6491,18 +7031,18 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6510,10 +7050,10 @@ if test "$_lt_caught_CXX_error" != yes; then *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6571,22 +7111,17 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6602,9 +7137,9 @@ if test "$_lt_caught_CXX_error" != yes; then # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6622,17 +7157,17 @@ if test "$_lt_caught_CXX_error" != yes; then cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6647,21 +7182,21 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6707,9 +7242,9 @@ if test "$_lt_caught_CXX_error" != yes; then # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6717,7 +7252,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6734,30 +7269,30 @@ if test "$_lt_caught_CXX_error" != yes; then ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6765,11 +7300,11 @@ if test "$_lt_caught_CXX_error" != yes; then output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6778,52 +7313,52 @@ if test "$_lt_caught_CXX_error" != yes; then ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6854,10 +7389,10 @@ if test "$_lt_caught_CXX_error" != yes; then esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6884,7 +7419,7 @@ if test "$_lt_caught_CXX_error" != yes; then lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6906,13 +7441,14 @@ AC_REQUIRE([_LT_DECL_SED]) AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -6996,13 +7532,13 @@ if AC_TRY_EVAL(ac_compile); then pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7018,16 +7554,16 @@ if AC_TRY_EVAL(ac_compile); then case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7035,9 +7571,9 @@ if AC_TRY_EVAL(ac_compile); then esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7052,15 +7588,15 @@ if AC_TRY_EVAL(ac_compile); then continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7091,51 +7627,6 @@ interix[[3-9]]*) _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7144,7 +7635,7 @@ case " $_LT_TAGVAR(postdeps, $1) " in esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7164,10 +7655,10 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1], # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7204,7 +7695,7 @@ _LT_TAGVAR(objext, $1)=$objext # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7226,7 +7717,7 @@ if test "$_lt_disable_F77" != yes; then _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7240,21 +7731,25 @@ if test "$_lt_disable_F77" != yes; then AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7262,11 +7757,11 @@ if test "$_lt_disable_F77" != yes; then AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7283,9 +7778,9 @@ if test "$_lt_disable_F77" != yes; then fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7295,11 +7790,11 @@ AC_LANG_POP # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7336,7 +7831,7 @@ _LT_TAGVAR(objext, $1)=$objext # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7358,7 +7853,7 @@ if test "$_lt_disable_FC" != yes; then _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7374,21 +7869,25 @@ if test "$_lt_disable_FC" != yes; then AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7396,11 +7895,11 @@ if test "$_lt_disable_FC" != yes; then AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7420,7 +7919,7 @@ if test "$_lt_disable_FC" != yes; then GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7430,7 +7929,7 @@ AC_LANG_POP # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7464,7 +7963,7 @@ CC=${GCJ-"gcj"} CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7501,7 +8000,7 @@ CFLAGS=$lt_save_CFLAGS # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7535,7 +8034,7 @@ CC=${GOC-"gccgo"} CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7572,7 +8071,7 @@ CFLAGS=$lt_save_CFLAGS # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7588,7 +8087,7 @@ _LT_TAGVAR(objext, $1)=$objext lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7598,7 +8097,7 @@ _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7627,7 +8126,7 @@ AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7738,7 +8237,7 @@ lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7755,9 +8254,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7781,27 +8280,7 @@ dnl AC_DEFUN([LT_AC_PROG_SED], []) # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7825,102 +8304,9 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 5d9acd8..94b0829 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION], [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ m4_if([$1],[LT_INIT],[ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN], [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL], _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ AC_ARG_ENABLE([shared], *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], []) # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ AC_ARG_ENABLE([static], *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], []) # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ AC_ARG_ENABLE([fast-install], *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ m4_define([_LT_WITH_PIC], *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE], [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 9000a05..48bc934 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ m4_define([_lt_join], # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ m4_define([lt_unquote], $1) # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index 07a8602..fa04b52 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index c573da9..c6b26f8 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff --git a/missing b/missing index f62bbae..8d0eaad 100755 --- a/missing +++ b/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2013-10-28.13; # UTC # 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, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ else exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/rpm/Makefile.in b/rpm/Makefile.in index 9e43f01..8f43de6 100644 --- a/rpm/Makefile.in +++ b/rpm/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -113,7 +113,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -172,6 +172,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -243,6 +244,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -277,8 +279,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -302,7 +304,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/rpm/barnyard2.spec b/rpm/barnyard2.spec index fa20fce..bf3107d 100644 --- a/rpm/barnyard2.spec +++ b/rpm/barnyard2.spec @@ -19,6 +19,8 @@ # See pg 399 of _Red_Hat_RPM_Guide_ for rpmbuild --with and --without options. ################################################################ +%global debug_package %{nil} + # Other useful bits %define OracleHome /opt/oracle/OraHome1 @@ -51,6 +53,7 @@ Group: Applications/Internet Url: http://www.github.com/firnsy/barnyard2 BuildRoot: %{_tmppath}/%{name}-%{version}-root +Buildrequires: gcc-c++ %if %{libpcap1} BuildRequires: libpcap1-devel %else @@ -74,7 +77,7 @@ the last entry as listed in the waldo file. %package mysql Summary: barnyard2 with MySQL support Group: Applications/Internet -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %if %{mysql} Requires: mysql BuildRequires: mysql-devel @@ -85,7 +88,7 @@ barnyard2 binary compiled with mysql support. %package postgresql Summary: barnyard2 with PostgreSQL support Group: Applications/Internet -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %if %{postgresql} Requires: postgresql BuildRequires: postgresql-devel @@ -96,7 +99,7 @@ barnyard2 binary compiled with postgresql support. %package oracle Summary: barnyard2 with Oracle support Group: Applications/Internet -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description oracle barnyard2 binary compiled with Oracle support. diff --git a/schemas/Makefile.in b/schemas/Makefile.in index 0de3c00..5c86ac7 100644 --- a/schemas/Makefile.in +++ b/schemas/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -113,7 +113,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -172,6 +172,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -243,6 +244,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -279,8 +281,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -304,7 +306,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/src/Makefile.in b/src/Makefile.in index 2f91b68..7ca823a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -130,7 +130,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -171,7 +171,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -267,6 +267,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -338,6 +339,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -399,8 +401,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -585,7 +587,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/src/input-plugins/Makefile.in b/src/input-plugins/Makefile.in index de40a3e..e2b0325 100644 --- a/src/input-plugins/Makefile.in +++ b/src/input-plugins/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -125,7 +125,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -224,6 +224,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -295,6 +296,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -327,8 +329,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -421,7 +423,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/src/output-plugins/Makefile.in b/src/output-plugins/Makefile.in index dd74460..e8dd4f7 100644 --- a/src/output-plugins/Makefile.in +++ b/src/output-plugins/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -135,7 +135,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -234,6 +234,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -305,6 +306,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -359,8 +361,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -453,7 +455,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/src/rbutil/Makefile.in b/src/rbutil/Makefile.in index 27f2170..a1e492c 100644 --- a/src/rbutil/Makefile.in +++ b/src/rbutil/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -126,7 +126,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -225,6 +225,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -296,6 +297,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -328,8 +330,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -422,7 +424,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/src/sfutil/Makefile.in b/src/sfutil/Makefile.in index 11ba64d..27bb43b 100644 --- a/src/sfutil/Makefile.in +++ b/src/sfutil/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -128,7 +128,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -227,6 +227,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -298,6 +299,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -341,8 +343,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -435,7 +437,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ From 181ff00aa531599a2866dce08c76d20a20525d41 Mon Sep 17 00:00:00 2001 From: David Vanhoucke Date: Mon, 6 Nov 2023 18:47:23 +0000 Subject: [PATCH 195/198] update spec file --- rpm/barnyard2.spec | 163 +++++---------------------------------------- 1 file changed, 15 insertions(+), 148 deletions(-) diff --git a/rpm/barnyard2.spec b/rpm/barnyard2.spec index bf3107d..101cc8e 100644 --- a/rpm/barnyard2.spec +++ b/rpm/barnyard2.spec @@ -1,6 +1,4 @@ -# $Id$ -# Snort.org's SPEC file for Snort - +# TODO ################################################################ # rpmbuild Package Options # ======================== @@ -21,116 +19,35 @@ %global debug_package %{nil} -# Other useful bits -%define OracleHome /opt/oracle/OraHome1 - -# Default of no MySQL, but --with mysql will enable it -%define mysql 0 -%{?_with_mysql:%define mysql 1} - -# Default of no PostgreSQL, but --with postgresql will enable it -%define postgresql 0 -%{?_with_postgresql:%define postgresql 1} - -# Default of no Oracle, but --with oracle will enable it -%define oracle 0 -%{?_with_oracle:%define oracle 1} - -# Build with libpcap1 from Vincent Cojot's snort packages -# Default to standard libpcap, but --with libpcap1 will enable libpcap1 -# http://vscojot.free.fr/dist/snort/ -%define libpcap1 0 -%{?_with_libpcap1:%define libpcap1 1} - - Summary: Snort Log Backend Name: barnyard2 Version: 1.14 -Source0: https://github.com/firnsy/barnyard2/archive/v2-%{version}.tar.gz +Source0: v2-%{version}.tar.gz Release: 1%{?dist} License: GPL Group: Applications/Internet Url: http://www.github.com/firnsy/barnyard2 BuildRoot: %{_tmppath}/%{name}-%{version}-root -Buildrequires: gcc-c++ -%if %{libpcap1} -BuildRequires: libpcap1-devel -%else -BuildRequires: libpcap-devel -%endif -Requires: librd0 librdkafka1 +#Requires: librd0 librdkafka1 +Requires: librd0 librdkafka curl-devel GeoIP-devel GeoIP GeoIP-GeoLite-data-extra %description -Barnyard has 3 modes of operation: -One-shot, continual, continual w/ checkpoint. In one-shot mode, -barnyard will process the specified file and exit. In continual mode, -barnyard will start with the specified file and continue to process -new data (and new spool files) as it appears. Continual mode w/ -checkpointing will also use a checkpoint file (or waldo file in the -snort world) to track where it is. In the event the barnyard process -ends while a waldo file is in use, barnyard will resume processing at -the last entry as listed in the waldo file. - - -%package mysql -Summary: barnyard2 with MySQL support -Group: Applications/Internet -Requires: %{name} = %{version}-%{release} -%if %{mysql} -Requires: mysql -BuildRequires: mysql-devel -%endif -%description mysql -barnyard2 binary compiled with mysql support. - -%package postgresql -Summary: barnyard2 with PostgreSQL support -Group: Applications/Internet -Requires: %{name} = %{version}-%{release} -%if %{postgresql} -Requires: postgresql -BuildRequires: postgresql-devel -%endif -%description postgresql -barnyard2 binary compiled with postgresql support. - -%package oracle -Summary: barnyard2 with Oracle support -Group: Applications/Internet -Requires: %{name} = %{version}-%{release} -%description oracle -barnyard2 binary compiled with Oracle support. - -EXPERIMENTAL!! I don't have a way to test this, so let me know if it works! -ORACLE_HOME=%{OracleHome} +barnyard2 version 1.14 %prep -%setup -q - +%setup -q %build -git clone --branch v0.9.2 https://github.com/edenhill/librdkafka.git /tmp/librdkafka-v0.9.2 -cd /tmp/librdkafka-v0.9.2 -./configure --prefix=/usr --sbindir=/usr/bin --exec-prefix=/usr && make -make install - -%configure \ - %if %{libpcap1} - --with-libpcap-includes=/usr/libpcap1/include \ - --with-libpcap-libraries=/usr/%{_lib}/libpcap1/%{_lib} \ - %endif - %if %{postgresql} - --with-postgresql \ - %endif - %if %{oracle} - --with-oracle \ - %endif - %if %{mysql} - --with-mysql-libraries=/usr/%{_lib} \ - %endif - +./configure --prefix=/ --sbindir=/usr/sbin --exec-prefix=/ \ + --enable-ipv6 --enable-geo-ip --enable-kafka \ + --with-rdkafka-includes=/usr/include \ + --with-rdkafka-libraries=/usr/lib \ + --with-macs-vendors-includes=/usr/include \ + --with-macs-vendors-libraries=/usr/lib64 \ + --enable-rb-macs-vendors --enable-rb-http \ + --enable-debug --enable-extradata make %install @@ -157,56 +74,6 @@ fi %attr(644,root,root) /usr/lib/systemd/system/barnyard2.service %changelog -* Thu Feb 02 2012 Brent Woodruff -- Removed Source2 and Source3 -- Removed unused realname variable -- Removed unused noShell variable -- Removed unused SnortRulesDir variable -- Added BuildRequires: libpcap-devel -- Added --with libpcap1 option -- Removed unneeded -n barnyard2-%{version} from setup -- Removed empty directories created by install -- Removed duplicate barnyard2.conf from install command -- Add mv command to put barnyard2.conf installed by %makeinstall in /etc/snort - (mv instead of rm, doesn't really matter either way) -- Changed doc/* to doc/INSTALL doc/README.* - -* Mon Jan 10 2011 Jason Haar -- updated spec file - -* Sat Jan 16 2010 Ian Firns -- barnyard2-1.8-beta2 - -* Mon Sep 13 2009 Tom McLaughlin -- barnyard2-1.7-beta2 - -* Mon Apr 27 2009 Jason Haar -- Converted barnyard-0.2.0 .spec - -* Wed Sep 13 2006 Matthew Hall 0.2.0-3%{?dist} -- Apply Colin Grady's schema patches - -* Tue Jun 06 2006 Fabien Bourdaire 0.2.0-1%{?dist} -- Build for FireHat 2.0 - -* Sat Sep 04 2004 Ralf Spenneberg -- migrated to Barnyard 0.2.0 and Fedora Core 2 - -* Sun Apr 13 2003 Ralf Spenneberg -- changed numbering scheme to reflect RH 8.0 - -* Wed Apr 09 2003 Ralf Spenneberg -- based on Barnyard Final Release 0.1.0 - -* Tue Oct 22 2002 Ralf Spenneberg -- based on Barnyard Release Candidate 3 -- built on RedHat 8.0 - -* Wed Jul 24 2002 Ralf Spenneberg -- based on Barnyard Release Candidate 2 -- removed classification.config gen-msg.map sid-msg.map - -* Sat Apr 06 2002 Ralf Spenneberg -- Based on Barnyard Beta 4 +* Mon Nov 06 2023 David Vanhoucke - 2.14-1 - Created barnyard rpm From bd81df0cbae04d16fa9f86b171939d2192c9e3e2 Mon Sep 17 00:00:00 2001 From: David Vanhoucke Date: Tue, 2 Apr 2024 10:23:39 +0000 Subject: [PATCH 196/198] update process rpm creation --- .gitignore | 4 + Makefile.am | 2 +- Makefile.in | 2 +- configure | 3 +- configure.in | 1 - {rpm => packaging/rpm}/barnyard2 | 0 {rpm => packaging/rpm}/barnyard2.config | 0 {rpm => packaging/rpm}/barnyard2.service | 0 {rpm => packaging/rpm}/barnyard2.spec | 33 +- rpm/Makefile.am | 7 - rpm/Makefile.in | 459 ----------------------- rpm/rpm_build.sh | 3 - 12 files changed, 24 insertions(+), 490 deletions(-) rename {rpm => packaging/rpm}/barnyard2 (100%) rename {rpm => packaging/rpm}/barnyard2.config (100%) rename {rpm => packaging/rpm}/barnyard2.service (100%) rename {rpm => packaging/rpm}/barnyard2.spec (68%) delete mode 100644 rpm/Makefile.am delete mode 100644 rpm/Makefile.in delete mode 100755 rpm/rpm_build.sh diff --git a/.gitignore b/.gitignore index f6021bd..b565650 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,7 @@ src/sfutil/libsfutil.a src/rbutil/librbutil.a stamp-h1 *Makefile.in + +#RPM +pkgs +SOURCES diff --git a/Makefile.am b/Makefile.am index 78997ba..f400ed1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src etc doc rpm schemas m4 +SUBDIRS = src etc doc schemas m4 INCLUDES = @INCLUDES@ diff --git a/Makefile.in b/Makefile.in index 596f656..720fe39 100644 --- a/Makefile.in +++ b/Makefile.in @@ -338,7 +338,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src etc doc rpm schemas m4 +SUBDIRS = src etc doc schemas m4 EXTRA_DIST = COPYING LICENSE README RELEASE.NOTES ltmain.sh autogen.sh all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/configure b/configure index eeb8d45..195bd96 100755 --- a/configure +++ b/configure @@ -17099,7 +17099,7 @@ INCLUDES='-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/sfutil $(extra -ac_config_files="$ac_config_files Makefile src/Makefile src/sfutil/Makefile src/rbutil/Makefile src/input-plugins/Makefile src/output-plugins/Makefile etc/Makefile doc/Makefile rpm/Makefile schemas/Makefile m4/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile src/sfutil/Makefile src/rbutil/Makefile src/input-plugins/Makefile src/output-plugins/Makefile etc/Makefile doc/Makefile schemas/Makefile m4/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18132,7 +18132,6 @@ do "src/output-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/output-plugins/Makefile" ;; "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "rpm/Makefile") CONFIG_FILES="$CONFIG_FILES rpm/Makefile" ;; "schemas/Makefile") CONFIG_FILES="$CONFIG_FILES schemas/Makefile" ;; "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; diff --git a/configure.in b/configure.in index 9f995ce..5d2d096 100644 --- a/configure.in +++ b/configure.in @@ -1311,7 +1311,6 @@ src/input-plugins/Makefile \ src/output-plugins/Makefile \ etc/Makefile \ doc/Makefile \ -rpm/Makefile \ schemas/Makefile \ m4/Makefile]) AC_OUTPUT diff --git a/rpm/barnyard2 b/packaging/rpm/barnyard2 similarity index 100% rename from rpm/barnyard2 rename to packaging/rpm/barnyard2 diff --git a/rpm/barnyard2.config b/packaging/rpm/barnyard2.config similarity index 100% rename from rpm/barnyard2.config rename to packaging/rpm/barnyard2.config diff --git a/rpm/barnyard2.service b/packaging/rpm/barnyard2.service similarity index 100% rename from rpm/barnyard2.service rename to packaging/rpm/barnyard2.service diff --git a/rpm/barnyard2.spec b/packaging/rpm/barnyard2.spec similarity index 68% rename from rpm/barnyard2.spec rename to packaging/rpm/barnyard2.spec index 101cc8e..8ecd3be 100644 --- a/rpm/barnyard2.spec +++ b/packaging/rpm/barnyard2.spec @@ -19,44 +19,45 @@ %global debug_package %{nil} +%define realname barnyard2 +%define release 1 + Summary: Snort Log Backend -Name: barnyard2 -Version: 1.14 -Source0: v2-%{version}.tar.gz -Release: 1%{?dist} +Name: %{realname} +Version: %{__version} +Source0: %{realname}-%{version}.tar.gz +Release: %{release}%{?dist} License: GPL Group: Applications/Internet Url: http://www.github.com/firnsy/barnyard2 -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -#Requires: librd0 librdkafka1 -Requires: librd0 librdkafka curl-devel GeoIP-devel GeoIP GeoIP-GeoLite-data-extra +BuildRequires: librd-devel librdkafka-devel librb-http-devel libpcap-devel GeoIP-devel rb_macs_vendors +Requires: librd0 librdkafka librb-http0 libpcap curl-devel GeoIP-devel GeoIP GeoIP-GeoLite-data-extra rb_macs_vendors %description barnyard2 version 1.14 %prep -%setup -q +%setup -qn %{realname}-%{version} %build ./configure --prefix=/ --sbindir=/usr/sbin --exec-prefix=/ \ --enable-ipv6 --enable-geo-ip --enable-kafka \ + --enable-rb-macs-vendors --enable-rb-http \ --with-rdkafka-includes=/usr/include \ - --with-rdkafka-libraries=/usr/lib \ + --with-rdkafka-libraries=/lib64 \ --with-macs-vendors-includes=/usr/include \ - --with-macs-vendors-libraries=/usr/lib64 \ - --enable-rb-macs-vendors --enable-rb-http \ - --enable-debug --enable-extradata + --with-macs-vendors-libraries=/lib \ + --enable-extradata make %install %makeinstall %{__mkdir_p} -p $RPM_BUILD_ROOT/usr/lib/systemd/system/ %{__install} -d -p $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,rc.d/init.d,snort} -%{__install} -m 644 rpm/barnyard2.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/barnyard2 -%{__install} -m 755 rpm/barnyard2 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/barnyard2 -%{__install} -p -m 0644 rpm/barnyard2.service $RPM_BUILD_ROOT/usr/lib/systemd/system/barnyard2.service +%{__install} -m 644 packaging/rpm/barnyard2.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/barnyard2 +%{__install} -m 755 packaging/rpm/barnyard2 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/barnyard2 +%{__install} -p -m 0644 packaging/rpm/barnyard2.service $RPM_BUILD_ROOT/usr/lib/systemd/system/barnyard2.service %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/barnyard2.conf diff --git a/rpm/Makefile.am b/rpm/Makefile.am deleted file mode 100644 index 8b11a17..0000000 --- a/rpm/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -## $Id$ -AUTOMAKE_OPTIONS=foreign no-dependencies - -EXTRA_DIST = Makefile.am \ -barnyard2 \ -barnyard2.spec \ -barnyard2.config diff --git a/rpm/Makefile.in b/rpm/Makefile.in deleted file mode 100644 index 8f43de6..0000000 --- a/rpm/Makefile.in +++ /dev/null @@ -1,459 +0,0 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2020 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = { \ - if test -z '$(MAKELEVEL)'; then \ - false; \ - elif test -n '$(MAKE_HOST)'; then \ - true; \ - elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ - true; \ - else \ - false; \ - fi; \ -} -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = rpm -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libprelude.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -depcomp = -am__maybe_remake_depfiles = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -INCLUDES = @INCLUDES@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LIBOBJS = @LIBOBJS@ -LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ -LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ -LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ -LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ -LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ -LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ -LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TCLSH = @TCLSH@ -VERSION = @VERSION@ -YACC = @YACC@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -extra_incl = @extra_incl@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -runstatedir = @runstatedir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = foreign no-dependencies -EXTRA_DIST = Makefile.am \ -barnyard2 \ -barnyard2.spec \ -barnyard2.config - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign rpm/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign rpm/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags-am uninstall uninstall-am - -.PRECIOUS: Makefile - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/rpm/rpm_build.sh b/rpm/rpm_build.sh deleted file mode 100755 index 60ee161..0000000 --- a/rpm/rpm_build.sh +++ /dev/null @@ -1,3 +0,0 @@ -rm -f /root/rpmbuild/SOURCES/v2-1.14.tar.gz -( cd /root/projects && tar cfzv /root/rpmbuild/SOURCES/v2-1.14.tar.gz barnyard2-1.14 ) -rpmbuild -ba --target x86_64 barnyard2.spec From 0b4ea635fcccfdb1150b5abd6f03e84fd3f5fb8d Mon Sep 17 00:00:00 2001 From: David Vanhoucke Date: Thu, 11 Apr 2024 10:00:27 +0000 Subject: [PATCH 197/198] add makefile --- .gitignore | 1 - Makefile | 7 ++++++ packaging/rpm/Makefile | 53 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 Makefile create mode 100644 packaging/rpm/Makefile diff --git a/.gitignore b/.gitignore index b565650..290d77f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ cflags.out /config.* cppflags.out libtool -Makefile src/barnyard2 src/input-plugins/libspi.a src/output-plugins/libspo.a diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d70fde0 --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +all: rpm + +rpm: + $(MAKE) -C packaging/rpm + +rpmtest: + $(MAKE) LATEST=`git stash create` -C packaging/rpm \ No newline at end of file diff --git a/packaging/rpm/Makefile b/packaging/rpm/Makefile new file mode 100644 index 0000000..c976b46 --- /dev/null +++ b/packaging/rpm/Makefile @@ -0,0 +1,53 @@ +PACKAGE_NAME?= barnyard2 + +VERSION?= $(shell git describe --abbrev=6 --tags HEAD --always | sed 's/-/_/g') + +BUILD_NUMBER?= 1 + +MOCK_CONFIG?=default + +RESULT_DIR?=pkgs + +LATEST?=HEAD + +all: rpm + + +SOURCES: + mkdir -p SOURCES + +archive: SOURCES + cd ../../ && \ + tar --exclude=packaging/rpm/SOURCES --exclude=.git -cvf packaging/rpm/SOURCES/$(PACKAGE_NAME)-$(VERSION).tar.gz \ + --transform 's%^./%$(PACKAGE_NAME)-$(VERSION)/%' . + #git archive --prefix=$(PACKAGE_NAME)-$(VERSION)/ \ + # -o packaging/rpm/SOURCES/$(PACKAGE_NAME)-$(VERSION).tar.gz $(LATEST) + + +build_prepare: archive + mkdir -p $(RESULT_DIR) + rm -f $(RESULT_DIR)/$(PACKAGE_NAME)*.rpm + + +srpm: build_prepare + /usr/bin/mock \ + -r $(MOCK_CONFIG) \ + --define "__version $(VERSION)" \ + --define "__release $(BUILD_NUMBER)" \ + --resultdir=$(RESULT_DIR) \ + --buildsrpm \ + --spec=${PACKAGE_NAME}.spec \ + --sources=SOURCES + @echo "======= Source RPM now available in $(RESULT_DIR) =======" + +rpm: srpm + /usr/bin/mock \ + -r $(MOCK_CONFIG) \ + --define "__version $(VERSION)"\ + --define "__release $(BUILD_NUMBER)"\ + --resultdir=$(RESULT_DIR) \ + --rebuild $(RESULT_DIR)/$(PACKAGE_NAME)*.src.rpm + @echo "======= Binary RPMs now available in $(RESULT_DIR) =======" + +clean: + rm -rf SOURCES pkgs From 294aa24f1b6552289fe1a74642ab2f9fb678d847 Mon Sep 17 00:00:00 2001 From: Miguel Negron Date: Thu, 11 Apr 2024 09:39:16 +0000 Subject: [PATCH 198/198] Add gcc into buildrequires --- packaging/rpm/barnyard2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/rpm/barnyard2.spec b/packaging/rpm/barnyard2.spec index 8ecd3be..aa09f20 100644 --- a/packaging/rpm/barnyard2.spec +++ b/packaging/rpm/barnyard2.spec @@ -31,7 +31,7 @@ License: GPL Group: Applications/Internet Url: http://www.github.com/firnsy/barnyard2 -BuildRequires: librd-devel librdkafka-devel librb-http-devel libpcap-devel GeoIP-devel rb_macs_vendors +BuildRequires: librd-devel librdkafka-devel librb-http-devel libpcap-devel GeoIP-devel rb_macs_vendors gcc Requires: librd0 librdkafka librb-http0 libpcap curl-devel GeoIP-devel GeoIP GeoIP-GeoLite-data-extra rb_macs_vendors %description