Merge lp:~noskcaj/ubuntu/vivid/sagan/liblognorm-transition into lp:ubuntu/vivid/sagan

[Jackson Doak]

New upstream RC release. Allows the package to build, so this is preferable to our current version.

[Iain Lane (laney)]

I don't think this works very well, can you fix? Might be an update to sagan-rules.

laney@raleigh> sagan
[E] [sagan.c, line 392] Cannot open /var/log/sagan/sagan.log!
laney@raleigh> sudo sagan
[*] Loading classifications.conf file. [/etc/sagan-rules/classification.config]
[*] 46 classifications loaded
[*] Loading references.conf file. [/etc/sagan-rules/reference.config]
[*] 6 references loaded.
[*] Loading gen-msg.map file. [/etc/sagan-rules/gen-msg.map]
[E] [sagan-gen-msg.c, line 62] Cannot open generator file (/etc/sagan-rules/gen-msg.map)

review: Needs Fixing

Unmerged revisions

12. By Jackson Doak on 2014-11-22

Add build-dep on libee-dev.

11. By Jackson Doak on 2014-11-22

* New upstream release.
* Drop patch, no longer needed

=== removed directory '.pc/01-do-not-include-lognorm-private-header.patch'
=== removed directory '.pc/01-do-not-include-lognorm-private-header.patch/src'
=== removed file '.pc/01-do-not-include-lognorm-private-header.patch/src/sagan-config.c'
--- .pc/01-do-not-include-lognorm-private-header.patch/src/sagan-config.c	2012-04-16 22:33:24 +0000
+++ .pc/01-do-not-include-lognorm-private-header.patch/src/sagan-config.c	1970-01-01 00:00:00 +0000
@@ -1,532 +0,0 @@
-/*
-** Copyright (C) 2009-2012 Quadrant Information Security <quadrantsec.com>
-** Copyright (C) 2009-2012 Champ Clark III <[e-mail]>
-**
-** 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.
-*/
-
-/* sagan-config.c
- *
- * Loads the sagan.conf file into memory 
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"             /* From autoconf */
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <getopt.h>
-#include <time.h>
-#include <signal.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <math.h>
-
-#ifdef HAVE_LIBLOGNORM
-#include <liblognorm.h>
-#include <ptree.h>
-#include <lognorm.h>
-#endif
-
-#include "version.h"
-
-#include "sagan.h"
-
-#ifdef HAVE_LIBDNET
-#include "output-plugins/sagan-unified2.h"
-#endif
-
-
-#ifdef HAVE_LIBLOGNORM
-struct liblognorm_struct *liblognormstruct;
-int liblognorm_count;
-#endif
-
-struct _Rule_Struct *rulestruct;
-struct _SaganCounters *counters;
-
-void load_config( _SaganDebug *debug, _SaganConfig *config  ) { 
-
-FILE *sagancfg; 
-
-char normfile[MAXPATH];
-
-char *filename;
-char ruleset[MAXPATH];
-
-char tmpbuf[CONFBUF];
-char tmpstring[CONFBUF];
-
-char *sagan_option=NULL;
-char *sagan_var=NULL;
-char *ptmp=NULL;
-
-char *tok=NULL;
-
-int i,check;
-
-/* Set some system defaults */
-
-snprintf(config->sagan_alert_filepath, sizeof(config->sagan_alert_filepath), "%s", ALERTLOG);
-snprintf(config->sagan_lockfile, sizeof(config->sagan_lockfile), "%s", LOCKFILE);
-snprintf(config->sagan_log_path, sizeof(config->sagan_log_path), "%s", SAGANLOGPATH);
-config->sagan_proto = 17;		/* Default to UDP */
-config->max_output_threads = MAX_OUTPUT_THREADS;
-config->max_processor_threads = MAX_PROCESSOR_THREADS;
-
-/* Start loading configuration */
-
-rulestruct = (_Rule_Struct *) realloc(rulestruct, (counters->rulecount+1) * sizeof(_Rule_Struct));
-
-/* Gather information for the master configuration file */
-
-
-if ((sagancfg = fopen(config->sagan_config, "r")) == NULL) {
-   fprintf(stderr, "[%s, line %d] Cannot open configuration file (%s)\n", __FILE__,  __LINE__, config->sagan_config);
-   exit(1);
-   }
-
-while(fgets(tmpbuf, sizeof(tmpbuf), sagancfg) != NULL) {
-     if (tmpbuf[0] == '#') continue;
-     if (tmpbuf[0] == ';') continue;
-     if (tmpbuf[0] == 10 ) continue;
-     if (tmpbuf[0] == 32 ) continue;
-
-     sagan_option = strtok_r(tmpbuf, " ", &tok);
-
-     if (!strcmp(remrt(sagan_option), "max_output_threads")) { 
-	 sagan_var = strtok_r(NULL, " ", &tok);
-         config->max_output_threads = atol(sagan_var);
-	 }
-
-     if (!strcmp(remrt(sagan_option), "max_processor_threads")) {
-	 sagan_var = strtok_r(NULL, " ", &tok);
-         config->max_processor_threads = atol(sagan_var);
-         }
-
-     if (!strcmp(remrt(sagan_option), "disable_dns_warnings")) { 
-         sagan_log(config, 0, "Supressing DNS warnings");
-         config->disable_dns_warnings = 1;
-	 }
-
-     if (!strcmp(remrt(sagan_option), "syslog_src_lookup")) { 
-         sagan_log(config, 0, "DNS lookup of source address supplied by syslog daemon");
-	 config->syslog_src_lookup = 1; 
-	 }
-
-
-     if (!strcmp(sagan_option, "sagan_host")) {
-        snprintf(config->sagan_host, sizeof(config->sagan_host)-1, "%s", strtok_r(NULL, " " , &tok));
-        config->sagan_host[strlen(config->sagan_host)-1] = '\0';
-        }
-
-     if (!strcmp(sagan_option, "sagan_port")) {
-         sagan_var = strtok_r(NULL, " ", &tok);
-	 config->sagan_port = atoi(sagan_var);
-         }
-
-#ifndef HAVE_LIBESMTP
-if (!strcmp(sagan_option, "send-to") || !strcmp(sagan_option, "min_email_priority")) 
-   sagan_log(config,1, "\"libesmtp\" support not found. Re-compile with ESMTP support or disable in the sagan.conf.");
-#endif
-
-#ifdef HAVE_LIBESMTP
-
-   if (!strcmp(sagan_option, "send-to")) { 
-      sagan_var = strtok_r(NULL, " ", &tok);
-      snprintf(config->sagan_esmtp_to, sizeof(config->sagan_esmtp_to), "%s", sagan_var);
-      remrt(config->sagan_esmtp_to);
-      config->sagan_esmtp_flag=1;
-      config->sagan_sendto_flag=1;
-      }
-
-   if (!strcmp(sagan_option, "min_email_priority")) {
-       sagan_var = strtok_r(NULL, " ", &tok);
-       config->min_email_priority = atoi(sagan_var);
-       }
-
-#endif
-
-#ifndef HAVE_LIBPCAP
-if (!strcmp(sagan_option, "plog_interface") || !strcmp(sagan_option, "plog_logdev") || !strcmp(sagan_option, "plog_port")) 
-   sagan_log(config,1, "\"libpcap\" support not found. Re-compile with PCAP support or disable in the sagan.conf.");
-#endif
-
-#ifdef HAVE_LIBPCAP
-
-    if (!strcmp(sagan_option, "plog_interface")) { 
-       snprintf(config->plog_interface, sizeof(config->plog_interface)-1, "%s", strtok_r(NULL, " ", &tok));
-       config->plog_interface[strlen(config->plog_interface)-1] = '\0';
-       config->plog_flag=1;
-       }
-
-    if (!strcmp(sagan_option, "plog_logdev")) { 
-       snprintf(config->plog_logdev, sizeof(config->plog_logdev)-1, "%s", strtok_r(NULL, " ", &tok));
-       config->plog_logdev[strlen(config->plog_logdev)-1] = '\0';
-       config->plog_flag=1;
-       }
-
-    if (!strcmp(sagan_option, "plog_port")) {
-       sagan_var = strtok_r(NULL, " ", &tok); 
-       config->plog_port = atoi(sagan_var);
-       config->plog_flag = 1;
-       }
-
-#endif
-
-#if defined(HAVE_LIBMYSQLCLIENT_R) || defined(HAVE_LIBPQ)
-
-     if (!strcmp(sagan_option, "sagan_proto")) { 
-        sagan_var = strtok_r(NULL, " ", &tok);
-	config->sagan_proto = atoi(sagan_var);
-	}
-     
-     if (!strcmp(sagan_option, "sagan_hostname")) { 
-        snprintf(config->sagan_hostname, sizeof(config->sagan_hostname)-1, "%s", strtok_r(NULL, " ", &tok));
-	config->sagan_hostname[strlen(config->sagan_hostname)-1] = '\0';
-	}
-
-     if (!strcmp(sagan_option, "sagan_interface")) { 
-        snprintf(config->sagan_interface, sizeof(config->sagan_interface)-1, "%s", strtok_r(NULL, " ", &tok)); 
-	config->sagan_interface[strlen(config->sagan_interface)-1] = '\0';
-	}
-
-     if (!strcmp(sagan_option, "sagan_filter")) { 
-        snprintf(config->sagan_filter, sizeof(config->sagan_filter)-1, "%s", strtok_r(NULL, " ", &tok)); 
-	config->sagan_filter[strlen(config->sagan_filter)-1] = '\0';
-	}
-    
-     if (!strcmp(sagan_option, "sagan_detail")) {  
-         sagan_var = strtok_r(NULL, " ", &tok);
-         config->sagan_detail = atoi(sagan_var);
-	 }
-
-#endif
-
-#ifndef HAVE_LIBLOGNORM
-if (!strcmp(sagan_option, "normalize:")) {
-   sagan_log(config, 0, "WARNING: Sagan was not compiled with \"liblognorm\" support!");
-   sagan_log(config, 0, "WARNING: Sagan will continue,  but _without_ liblognorm!");
-   }
-#endif
-
-#ifdef HAVE_LIBLOGNORM
-
-/*
- We load the location for liblognorm's 'rule base/samples'.  We don't want to 
- load them quiet yet.  We only want to load samples we need,  so we do the
- actual ln_loadSamples() after the configuration file and all rules have
- been analyzed */
-
-if (!strcmp(sagan_option, "normalize:")) {
-	liblognormstruct = (liblognorm_struct *) realloc(liblognormstruct, (liblognorm_count+1) * sizeof(liblognorm_struct));
-	
-	sagan_var = strtok_r(NULL, ",", &tok);
-	remspaces(sagan_var);
-	snprintf(liblognormstruct[liblognorm_count].type, sizeof(liblognormstruct[liblognorm_count].type), "%s", sagan_var);
-
-	snprintf(tmpstring, sizeof(tmpstring), "%s", strtok_r(NULL, ",", &tok));
-	remspaces(tmpstring);
-	tmpstring[strlen(tmpstring)-1] = '\0';
-	strlcpy(normfile, sagan_replace_str(tmpstring, "$RULE_PATH", config->sagan_rule_path), sizeof(normfile));
-	snprintf(liblognormstruct[liblognorm_count].filepath, sizeof(liblognormstruct[liblognorm_count].filepath), "%s", normfile);
-
-	liblognorm_count++;
-}
-
-#endif
-
-if (!strcmp(sagan_option, "output")) {
-             sagan_var = strtok_r(NULL," ", &tok);
-
-     if (!strcmp(sagan_var, "external:")) {
-        snprintf(config->sagan_extern, sizeof(config->sagan_extern), "%s", strtok_r(NULL, " ", &tok));
-        if (strstr(strtok_r(NULL, " ", &tok), "parsable")) config->sagan_exttype=1;
-	config->sagan_ext_flag=1;
-        }
-
-
-#ifdef WITH_SNORTSAM
-if (!strcmp(sagan_var, "alert_fwsam:")) { 
-       snprintf(config->sagan_fwsam_info, sizeof(config->sagan_fwsam_info), "%s", remrt(strtok_r(NULL, " ", &tok)));
-       config->sagan_fwsam_flag=1; 
-       }
-#endif
-
-#ifndef HAVE_LIBDNET
-if (!strcmp(sagan_var, "unified2:")) { 
-   sagan_log(config, 0,"\"libdnet\" support not found.  This is needed for unified2."); 
-   sagan_log(config, 1, "Re-compile with libdnet support or disable in the sagan.conf.");
-   }
-#endif
-
-#ifdef HAVE_LIBDNET
-
-if (!strcmp(sagan_var, "unified2:")) { 
-  
-  	   config->sagan_unified2_flag = 1;
-	   
-	   ptmp = sagan_var; 
-	   remrt(ptmp);
-
-	   while (ptmp != NULL ) {
-	     
-	     if (!strcmp(ptmp, "filename")) { 
-	        ptmp = strtok_r(NULL, ",", &tok);
-	 	snprintf(config->unified2_filepath, sizeof(config->unified2_filepath), "%s/%s", config->sagan_log_path, ptmp);
-		}
-
-	     if (!strcmp(ptmp, "limit")) { 
-	        ptmp = strtok_r(NULL, " ", &tok);
-	        config->unified2_limit = atoi(ptmp) * 1024 * 1024;
-		}
-
-             if (!strcmp(ptmp, "nostamp")) config->unified2_nostamp = 1;
-	   
-	   ptmp = strtok_r(NULL, " ", &tok);
-
-	   }
-}
-
-#endif
-
-#ifndef HAVE_LIBPRELUDE
-	if (!strcmp(sagan_var, "prelude:"))
-           sagan_log(config,1, " libprelude support not found. Re-compile with Prelude support or disable in the sagan.conf.");
-#endif 
-
-#ifdef HAVE_LIBPRELUDE
-	
-	if (!strcmp(sagan_var, "prelude:")) { 
-	   config->output_thread_flag = 1; 
-	   ptmp = sagan_var; 
-
-	   while (ptmp != NULL ) { 
-
-	     if (!strcmp(ptmp, "profile")) { 
-	         ptmp = strtok_r(NULL, " ", &tok);
-		 snprintf(config->sagan_prelude_profile, sizeof(config->sagan_prelude_profile), "%s", ptmp); 
-		 remrt(config->sagan_prelude_profile);
-		 config->sagan_prelude_flag=1;
-		 }
-           
-	   ptmp = strtok_r(NULL, "=", &tok);
-	   }
-	}
-#endif
-
-
-#ifdef HAVE_LIBESMTP
-
-	if (!strcmp(sagan_var, "email:")) { 
-	   config->output_thread_flag = 1;
-	   ptmp = sagan_var;
-
-	   while (ptmp != NULL ) { 
-
-             if (!strcmp(ptmp, "from")) {
-                ptmp = strtok_r(NULL, " ", &tok);
-                snprintf(config->sagan_esmtp_from, sizeof(config->sagan_esmtp_from), "%s", ptmp);
-		remrt(config->sagan_esmtp_from);
-                }
-
-             if (!strcmp(ptmp, "smtpserver")) {
-                ptmp = strtok_r(NULL, " ", &tok);
-                snprintf(config->sagan_esmtp_server, sizeof(config->sagan_esmtp_server), "%s", ptmp);
-		remrt(config->sagan_esmtp_server);
-                }
-
-          ptmp = strtok_r(NULL, "=", &tok);    
-	  }
-
-	}
-#endif
-
-
-#if defined(HAVE_LIBMYSQLCLIENT_R) || defined(HAVE_LIBPQ)
-
-	/* output type (database, etc) */
-
-	if (!strcmp(sagan_var, "database:")) {
-	   config->output_thread_flag = 1;
-	   sagan_var = strtok_r(NULL, ",", &tok);
-	
-	   /* Type (only "log" is used right now */
-
-	   if (!strcmp(sagan_var, "log")) { 
-	      sagan_var = strtok_r(NULL, ",", &tok); 
-	      }
-
-	      /* MySQL/PostgreSQL/Oracle/etc */
-
-	      remspaces(sagan_var);
-
-
-	      if (!strcmp(sagan_var, "mysql" )) { 
-#ifndef HAVE_LIBMYSQLCLIENT_R
-   	         sagan_log(config, 1,"MySQL support not found. Re-compile with MySQL support or disable in the sagan.conf.");
-#endif
-	         config->dbtype=1; 
-	         }
-
-	      if (!strcmp(sagan_var, "postgresql" )) { 
-#ifndef HAVE_LIBPQ
-		 sagan_log(config, 1,"PostgreSQL support not found. Re-compile with PostgreSQL support or disable in the sagan.conf.");
-#endif
-		 config->dbtype=2; 
-		 }
-
-
-	      sagan_var = strtok_r(NULL, ",", &tok);
-	      remrt(sagan_var);					/* rm NL */
-	      
-	      strlcpy(tmpbuf, sagan_var, sizeof(tmpbuf));
-
-	      ptmp = strtok_r(tmpbuf, "=", &tok);
-
-	      while (ptmp != NULL) { 
-	        remspaces(ptmp); 
-
-	        if (!strcmp(ptmp, "user")) { 
-		   ptmp = strtok_r(NULL, " ", &tok);
-		   snprintf(config->dbuser, sizeof(config->dbuser), "%s", ptmp);
-		   }
-
-                if (!strcmp(ptmp , "password")) {
-		   ptmp = strtok_r(NULL, " ", &tok);
-		   snprintf(config->dbpassword, sizeof(config->dbpassword), "%s", ptmp);
-                   }
-
-		if (!strcmp(ptmp, "dbname")) { 
-		   ptmp = strtok_r(NULL, " ", &tok);
-		   snprintf(config->dbname, sizeof(config->dbname), "%s", ptmp);
-		   }
-
-		if (!strcmp(ptmp, "host")) { 
-		   ptmp = strtok_r(NULL, " ", &tok);
-		   snprintf(config->dbhost, sizeof(config->dbhost), "%s", ptmp);
-		   }
-
-		if (!strcmp(ptmp, "port")) {
-		   config->dbport = atoi(ptmp);
-		   }
-
-	      ptmp = strtok_r(NULL, "=", &tok);
-
-
-	     }
-	   
-	   }
-#endif      
-   }
-       
-     /* "var" */
-
-     if (!strcmp(sagan_option, "var")) {
-         sagan_var = strtok_r(NULL, " ", &tok);
-
-        if (!strcmp(sagan_var, "FIFO" )) {
-	   snprintf(config->sagan_fifo, sizeof(config->sagan_fifo), "%s", strtok_r(NULL, " ", &tok));
-           config->sagan_fifo[strlen(config->sagan_fifo)-1] = '\0'; 
-	   }
-
-        if (!strcmp(sagan_var, "RULE_PATH" )) {
-	   snprintf(config->sagan_rule_path, sizeof(config->sagan_rule_path), "%s", strtok_r(NULL, " ", &tok));
-	   config->sagan_rule_path[strlen(config->sagan_rule_path)-1] = '\0';
-	   }
-
-        if (!strcmp(sagan_var, "LOCKFILE" )) {
-	   snprintf(config->sagan_lockfile, sizeof(config->sagan_lockfile), "%s", strtok_r(NULL, " ", &tok));
-           config->sagan_lockfile[strlen(config->sagan_lockfile)-1] = '\0'; 
-	   }
-
-        if (!strcmp(sagan_var, "ALERTLOG" )) {
-           snprintf(config->sagan_alert_filepath, sizeof(config->sagan_alert_filepath), "%s", strtok_r(NULL, " ", &tok));
-           config->sagan_alert_filepath[strlen(config->sagan_alert_filepath)-1] = '\0'; 
-	   }
-	
-	if (!strcmp(sagan_var, "SAGANLOGPATH" )) {
-           snprintf(config->sagan_log_path, sizeof(config->sagan_log_path), "%s", strtok_r(NULL, " ", &tok));
-           config->sagan_log_path[strlen(config->sagan_log_path)-1] = '\0';
-           }
-	}
-
-/* "include */
-
-     if (!strcmp(sagan_option, "include" )) {
-
-         snprintf(tmpstring, sizeof(tmpstring), "%s", strtok_r(NULL, " ", &tok));
-
-         tmpstring[strlen(tmpstring)-1] = '\0';
-	
-         strlcpy(ruleset, sagan_replace_str(tmpstring, "$RULE_PATH", config->sagan_rule_path), sizeof(ruleset));
-
-	 filename=sagan_getfilename(ruleset);   /* Get the file name to figure out "what" we're loading */
-
-         if (!strcmp(filename, "classification.config"))
-            {
-                   load_classifications(debug, config, ruleset);
-            }
-
-         if (!strcmp(filename, "reference.config"))
-            {
-                   load_reference(debug, config, ruleset);
-            }
-
-	 /* It's not a classifcations file or reference,  so it must be a ruleset */
-
-         if (strcmp(filename, "reference.config") && strcmp(filename, "classification.config"))  {
-                   
-		   load_rules(debug, config,  ruleset);
-          }
-     }
-}
-
-fclose(sagancfg);
-
-/* Check rules for duplicate sid.  We can't have that! */
-
-for (i = 0; i < counters->rulecount; i++) {
-   for ( check = i+1; check < counters->rulecount; check ++) {
-       if (!strcmp (rulestruct[check].s_sid, rulestruct[i].s_sid ))
-            sagan_log(config, 1, "[%s, line %d] Detected duplicate signature id [sid] number %s.  Please correct this.", __FILE__, __LINE__, rulestruct[check].s_sid, rulestruct[i].s_sid);
-       }
-   }
-
-/* If we have the "send-to" option,  verify the configuration has the proper smtpserver, etc.  */
-
-#ifdef HAVE_LIBESMTP
-
-if (config->sagan_esmtp_flag && !strcmp(config->sagan_esmtp_server, "")) sagan_log(config, 1, "[%s, line %d] Configuration SMTP 'smtpserver' field is missing! |%s|", __FILE__, __LINE__, config->sagan_esmtp_server);
-if (config->sagan_esmtp_flag && !strcmp(config->sagan_esmtp_from, "" )) sagan_log(config, 1, "[%s, line %d] Configuration SMTP 'from' field is missing!", __FILE__,  __LINE__);
-
-#endif 
-
-if (!strcmp(config->sagan_fifo, "")) sagan_log(config, 1, "No FIFO option found which is required! Aborting!");
-if (!strcmp(config->sagan_host, "" )) sagan_log(config, 1, "The 'sagan_host' option was not found and is required.");
-if ( config->sagan_port == 0 ) sagan_log(config, 1, "The 'sagan_port' option was not set and is required.");
-
-}

=== removed file '.pc/01-do-not-include-lognorm-private-header.patch/src/sagan-signal.c'
--- .pc/01-do-not-include-lognorm-private-header.patch/src/sagan-signal.c	2012-04-16 22:33:24 +0000
+++ .pc/01-do-not-include-lognorm-private-header.patch/src/sagan-signal.c	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-/*
-** Copyright (C) 2009-2012 Quadrant Information Security <quadrantsec.com>
-** Copyright (C) 2009-2012 Champ Clark III <[e-mail]>
-**
-** 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.
-*/
-
-/* sagan-signal.c
- *
- * This runs as a thread for signal processing.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"             /* From autoconf */
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <pthread.h>
-#include <stdint.h>
-
-#include "version.h"
-
-#include "sagan.h"
-
-#ifdef HAVE_LIBLOGNORM
-#include <liblognorm.h>
-#include <ptree.h>
-#include <lognorm.h>
-static ln_ctx ctx;
-int liblognorm_count;
-#endif
-
-#ifdef HAVE_LIBPRELUDE
-#include <libprelude/prelude.h>
-sbool sagan_prelude_flag;
-prelude_client_t *preludeclient;
-#endif
-
-#ifdef HAVE_LIBDNET
-#include "output-plugins/sagan-unified2.h"
-sbool sagan_unified2_flag;
-#endif
-
-#if defined(HAVE_LIBMYSQLCLIENT_R) || defined(HAVE_LIBPQ)
-#include "output-plugins/sagan-snort.h"
-#endif
-
-
-struct _SaganCounters *counters;
-
-struct rule_struct *rulestruct;
-struct class_struct *classstruct;
-struct ref_struct *refstruct;
-
-pthread_mutex_t sig_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-void sig_handler( _SaganSigArgs *args ) {
-
-        sigset_t signal_set;
-        int sig;
-
-        for(;;) {
-                /* wait for any and all signals */
-                sigfillset( &signal_set );
-                sigwait( &signal_set, &sig );
-
-
-                switch( sig )
-                {
-		  /* exit */
-		  case SIGQUIT:
-		  case SIGINT:
-		  case SIGTERM:
-		  case SIGSEGV:
-		  case SIGABRT:
-
-                  sagan_log(args->config, 0, "\n\n[Received signal %d. Sagan version %s shutting down]-------\n", sig, VERSION);
-		  sagan_statistics(args->config);
-
-#if defined(HAVE_LIBMYSQLCLIENT_R) || defined(HAVE_LIBPQ)
-
-		  /* last_cid != cid (has there been any alerts? */
-
-		  if ( args->config->dbtype != 0 && counters->last_cid != counters-> cid ) record_last_cid(args->debug, args->config, counters);
-#endif
-
-#ifdef HAVE_LIBPRELUDE
-
-/* This comment is from the Snort source code. "Sensor reporting to Prelude
-   shall never go offline,  which is why we use the 
-   PRELUDE_CLIENT_EXIT_STATUS_FAILURE.  */
-
-if ( sagan_prelude_flag != 0 ) { 
-prelude_client_destroy(preludeclient, PRELUDE_CLIENT_EXIT_STATUS_FAILURE);
-prelude_deinit();
-}
-
-#endif
-
-#ifdef HAVE_LIBDNET
-if ( sagan_unified2_flag ) Unified2CleanExit(args->config); 
-#endif
-
-	        fflush(args->config->sagan_alert_stream);
-	        fclose(args->config->sagan_alert_stream);             /* Close Sagan alert file */
-
-       		fflush(args->config->sagan_log_stream);               /* Close the sagan.log */
-        	fclose(args->config->sagan_log_stream);
-
-                removelockfile(args->config);
-                exit(0);
-                break;
-
-                 case SIGHUP:
-                   pthread_mutex_lock(&sig_mutex);
-   		   sagan_log(args->config, 0, "[Reloading Sagan version %s.]-------", VERSION);
-
-		      /* Reset counters */
-		   counters->refcount=0; counters->classcount=0; counters->rulecount=0; counters->ruletotal=0;
-		   
-		   /* Re-load everything */
-
-		  load_config(args->debug, args->config);
-
-                  pthread_mutex_unlock(&sig_mutex);
-		  
-		  sagan_log(args->config, 0, "Configuration reloaded.");
-                  break;
-
-		/* Signals to ignore */
-	        case 17:		/* Child process has exited. */	
-		case 28:		/* Terminal 'resize'/alarm. */
-		break;
-
-		case SIGUSR1:
-		sagan_statistics(args->config); 
-		break;
-
-		default:
-		sagan_log(args->config, 0, "[Received signal %d. Sagan doesn't know how to deal with]", sig);
-                }
-        }
-}
-

=== removed file '.pc/01-do-not-include-lognorm-private-header.patch/src/sagan.c'
--- .pc/01-do-not-include-lognorm-private-header.patch/src/sagan.c	2012-04-16 22:33:24 +0000
+++ .pc/01-do-not-include-lognorm-private-header.patch/src/sagan.c	1970-01-01 00:00:00 +0000
@@ -1,1322 +0,0 @@
-/*
-** Copyright (C) 2009-2012 Quadrant Information Security <quadrantsec.com>
-** Copyright (C) 2009-2012 Champ Clark III <[e-mail]>
-**
-** 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.
-*/
-
-/* sagan.c 
- *
- * This is the main "thread" and engine that looks for events & patterns 
- * based on 'snort like' rule sets.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"             /* From autoconf */
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <getopt.h>
-#include <time.h>
-#include <signal.h>
-#include <pcre.h>
-#include <limits.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-
-#include "sagan.h"
-
-#include "version.h"
-
-
-#ifdef HAVE_LIBLOGNORM
-#include <liblognorm.h>
-#include <ptree.h>
-#include <lognorm.h>
-#endif
-
-#ifdef HAVE_LIBDNET
-#include "output-plugins/sagan-unified2.h"
-#endif
-
-#define OVECCOUNT 30
-
-struct _SaganCounters *counters;
-struct _Rule_Struct *rulestruct;
-struct class_struct *classstruct;
-
-sbool daemonize=0;
-
-/****************************************************************************/
-/* Liblognorm Globals                                                       */
-/****************************************************************************/
-
-#ifdef HAVE_LIBLOGNORM
-struct stat fileinfo;
-struct liblognorm_struct *liblognormstruct;
-struct liblognorm_toload_struct *liblognormtoloadstruct;
-int liblognorm_count;
-
-static ln_ctx ctx;
-static ee_ctx eectx;
-
-es_str_t *str;
-es_str_t *propName = NULL;
-
-struct ee_event *lnevent = NULL;;
-struct ee_field *field = NULL;
-char *cstr;
-#endif
-
-/* ######################################################################## 
- * Start of main() thread
- * ######################################################################## */
-
-int main(int argc, char **argv) {
-
-const struct option long_options[] = {
-        { "help",         no_argument,          NULL,   'h' },
-        { "debug",        required_argument,    NULL,   'd' },
-        { "daemon",       no_argument,          NULL,   'D' },
-        { "user",         required_argument,    NULL,   'U' },
-        { "chroot",       required_argument,    NULL,   'c' },
-        { "config",       required_argument,    NULL,   'f' },
-        { "log",          required_argument,    NULL,   'l' },
-        {0, 0, 0, 0}
-
-};
-
-static const char *short_options =
-"l:f:u:d:c:pDh";
-
-int option_index = 0;
-
-/* Passing Sagan events to output plugins */
-
-struct _Sagan_Event *SaganEvent = NULL;
-SaganEvent = malloc(MAX_THREADS * sizeof(struct _Sagan_Event));
-
-/***************************************************************************/
-/* pthread for the output plugins                                          */
-/***************************************************************************/
-
-pthread_t output_id[MAX_THREADS];
-pthread_attr_t thread_output_attr;
-pthread_attr_init(&thread_output_attr);
-pthread_attr_setdetachstate(&thread_output_attr,  PTHREAD_CREATE_DETACHED);
-
-/****************************************************************************/
-/* pthread for the processor plugins                                        */
-/****************************************************************************/
-
-pthread_t processor_id[MAX_THREADS];
-pthread_attr_t thread_processor_attr;
-pthread_attr_init(&thread_processor_attr);
-pthread_attr_setdetachstate(&thread_processor_attr,  PTHREAD_CREATE_DETACHED);
-
-
-/****************************************************************************/
-/* libpcap/PLOG (syslog sniffer) local variables                            */
-/****************************************************************************/
-
-#ifdef HAVE_LIBPCAP
-pthread_t pcap_thread;
-pthread_attr_t thread_pcap_attr;
-pthread_attr_init(&thread_pcap_attr);
-pthread_attr_setdetachstate(&thread_pcap_attr,  PTHREAD_CREATE_DETACHED);
-#endif
-
-/****************************************************************************/
-/* Various local variables						    */
-/****************************************************************************/
-
-#if defined(HAVE_LIBMYSQLCLIENT_R) || defined(HAVE_LIBPQ)
-char *sqlout=NULL;
-char *sql=NULL;
-char sqltmp[MAXSQL];
-#endif
-
-/* Block all signals,  we create a signal handling thread */
-
-sigset_t signal_set;
-pthread_t sig_thread;
-sigfillset( &signal_set );
-pthread_sigmask( SIG_BLOCK, &signal_set, NULL );
-
-/* Key board handler (displays stats, etc */
-
-pthread_t key_thread;
-pthread_attr_t key_thread_attr;
-pthread_attr_init(&key_thread_attr);
-pthread_attr_setdetachstate(&key_thread_attr,  PTHREAD_CREATE_DETACHED);
-
-struct sockaddr_in sa;
-char src_dns_lookup[20];
-int  dns_flag=0;
-
-sbool fifoerr=0;
-
-int   threadid=0;
-
-char *ip_src = NULL;
-char *ip_dst = NULL;
-
-char ip_srctmp[MAX_MSGSLOT][MAXIP];
-char ip_dsttmp[MAX_MSGSLOT][MAXIP];
-
-char *username = NULL;
-char *uid = NULL;
-char s_msg[1024];
-char s_msgtmp[MAX_MSGSLOT][1024];
-
-int  src_port;
-int  dst_port;
-
-int src_porttmp[MAX_MSGSLOT];
-int dst_porttmp[MAX_MSGSLOT];
-
-int  after_count_by_src=0;
-int  after_count_by_dst=0;
-sbool after_flag=0;
-sbool after_log_flag=0;
-
-int  thresh_count_by_src=0;
-int  thresh_count_by_dst=0;
-sbool thresh_flag=0;
-sbool thresh_log_flag=0;
-char  timet[20];
-
-struct thresh_by_src *threshbysrc = NULL;
-struct thresh_by_dst *threshbydst = NULL;
-
-struct after_by_src *afterbysrc = NULL;
-struct after_by_dst *afterbydst = NULL;
-
-uint64_t thresh_oldtime_src;
-uint64_t after_oldtime_src;
-
-char fip[MAXIP];
-
-char *syslog_host=NULL;
-char  syslog_hosttmp[MAX_MSGSLOT][MAXHOST];
-
-char *syslog_facility=NULL;
-char syslog_facilitytmp[MAX_MSGSLOT][MAXFACILITY];
-
-char *syslog_priority=NULL;
-
-char *syslog_level=NULL;
-char syslog_leveltmp[MAX_MSGSLOT][MAXLEVEL];
-
-char *syslog_tag=NULL;
-char syslog_tagtmp[MAX_MSGSLOT][MAXTAG];
-
-char *syslog_date=NULL;
-char syslog_datetmp[MAX_MSGSLOT][MAXDATE];
-
-char *syslog_time=NULL;
-char syslog_timetmp[MAX_MSGSLOT][MAXTIME];
-
-char *syslog_program=NULL;
-char syslog_programtmp[MAX_MSGSLOT][MAXPROGRAM];
-
-char *syslog_msg=NULL;
-char syslog_msg_origtmp[MAX_SYSLOGMSG];
-
-int rc=0;
-
-int ovector[OVECCOUNT];
-
-char syslogstring[MAX_SYSLOGMSG];
-char sysmsg[MAX_MSGSLOT][MAX_SYSLOGMSG]; 
-int  msgslot=0;
-char syslogtmp[2];
-char c;
-
-char *ptmp;
-char *tok;
-char *tok2;
-
-/* For the ruleset */
-
-char *content;
-char *program;
-char *facility;
-char *syspri;
-char *level;
-char *tag;
-char tmpbuf[128];
-memset(tmpbuf,0,128);
-char ipbuf_src[128];
-char ipbuf_dst[128];
-
-char *syslog_msg_case;
-char *s_content_case;
-
-char *runas=RUNAS;
-
-int i;
-int fd=0;
-int b;
-int z;
-int match=0;
-int pcrematch=0;
-
-time_t t;
-struct tm *now, *run;
-
-/* Allocate and clear memory for global structs */
-
-struct _SaganDebug *debug;
-debug = malloc(sizeof(_SaganDebug));
-memset(debug, 0, sizeof(_SaganDebug));
-
-struct _SaganConfig *config;
-config = malloc(sizeof(_SaganConfig));
-memset(config, 0, sizeof(_SaganConfig));
-
-struct _SaganSigArgs *sigargs;
-sigargs = malloc(sizeof(_SaganSigArgs));
-memset(sigargs, 0, sizeof(_SaganSigArgs));
-
-struct _SaganDNSCache *dnscache; 
-dnscache = malloc(sizeof(_SaganDNSCache)); 
-memset(dnscache, 0, sizeof(_SaganDNSCache));
-
-counters = malloc(sizeof(_SaganCounters));
-memset(counters, 0, sizeof(_SaganCounters));
-
-t = time(NULL);
-run=localtime(&t);
-strftime(config->sagan_startutime, sizeof(config->sagan_startutime), "%s",  run);
-
-
-snprintf(config->sagan_config, sizeof(config->sagan_config), "%s", CONFIG_FILE_PATH);
-
-/* We set the config->sagan_log_filepath to the system default.  It'll be fopen'ed 
-   shortly - 06/03/2011 - Champ Clark III */
-
-snprintf(config->sagan_log_filepath, sizeof(config->sagan_log_filepath), "%s", SAGANLOG);
-
-/* Get command line arg's */
-while ((c = getopt_long(argc, argv, short_options, long_options, &option_index)) != -1) { 
-   
-   switch(c) {
-           
-	   if (c == -1) break;
-
-           case 'h':
-	   sagan_usage();
-	   exit(0);
-	   break;
-	   
-	   case 'd':
-
-              if (strstr(optarg, "syslog")) debug->debugsyslog=1;
-              if (strstr(optarg, "load")) debug->debugload=1;
-	      if (strstr(optarg, "fwsam")) debug->debugfwsam=1;
-
-#ifdef HAVE_LIBLOGNORM
-	      if (strstr(optarg, "normalize" )) debug->debugnormalize=1;
-#endif
-              
-#if defined(HAVE_LIBMYSQLCLIENT_R) || defined(HAVE_LIBPQ)
-	      if (strstr(optarg, "sql")) debug->debugsql=1;
-#endif
-
-#ifdef HAVE_LIBESMTP
-	      if (strstr(optarg, "smtp")) debug->debugesmtp=1;
-#endif
-
-#ifdef HAVE_LIBPCAP
-	      if (strstr(optarg, "plog")) debug->debugplog=1;
-#endif
-
-	   break;
-          
-	   case 'D':
-	   daemonize=1;
-	   break;
-
-	   case 'u':
-	   runas=optarg;
-	   break;
-
-	   case 'c':
-	   sagan_chroot(runas,optarg);
-	   break;
-
-	   case 'f':
-	   strncpy(config->sagan_config,optarg,sizeof(config->sagan_config) - 1);		//	strlcpy
-	   config->sagan_config[sizeof(config->sagan_config)-1] = '\0';
-	   break;
-
-	   case 'l':
-	   strncpy(config->sagan_log_filepath,optarg,sizeof(config->sagan_log_filepath) - 1);
-	   config->sagan_log_filepath[sizeof(config->sagan_log_filepath)-1] = '\0';
-	   break;
-	   
-
-	  default:
-          fprintf(stderr, "Invalid argument! See below for command line switches.\n");
-          sagan_usage();
-	  exit(0);
-	  break;
-  	  }
-}
-
-/* Open the sagan.log file.  Moved from sagan-config.c as it became to complex 
-   06/03/2011 - Champ Clark */
-
-if ((config->sagan_log_stream = fopen(config->sagan_log_filepath, "a")) == NULL) {
-    fprintf(stderr, "[E] [%s, line %d] Cannot open %s!\n", __FILE__, __LINE__, config->sagan_log_filepath);
-    exit(1);
-    }
-
-
-load_config( debug, config );
-
-/* Load/init liblognorm definitions.  I tried to move this into a subroutine,
- * but that ended up causing segfaults on ln_normalize() or causing 
- * liblognorm not to function correctly (not parsing fields).  Make reloading
- * a SIGHUP a issue as well.
- * 12/17/2010 - Champ
- */
-
-#ifdef HAVE_LIBLOGNORM
-if((ctx = ln_initCtx()) == NULL) sagan_log(config, 1, "[%s, line %d] Cannot initialize liblognorm context.", __FILE__, __LINE__);
-if((eectx = ee_initCtx()) == NULL) sagan_log(config, 1, "[%s, line %d] Cannot initialize libee context.", __FILE__, __LINE__);
-
-ln_setEECtx(ctx, eectx);
-
-for (i=0; i < counters->liblognormtoload_count; i++) { 
-sagan_log(config, 0, "Loading %s for normalization.", liblognormtoloadstruct[i].filepath);
-if (stat(liblognormtoloadstruct[i].filepath, &fileinfo)) sagan_log(config, 1, "%s was not fonnd.", liblognormtoloadstruct[i].filepath);
-ln_loadSamples(ctx, liblognormtoloadstruct[i].filepath);
-}
-#endif
-
-sagan_log(config, 0, "Configuration file %s loaded and %d rules loaded.", config->sagan_config, counters->rulecount);
-sagan_log(config, 0, "Sagan version %s is firing up!", VERSION);
-
-/* We go ahead and assign values to SaganSigArgs (struct sig_thread_args).  This
- * struct is always used by the sig_handler thread,  and sometimes used by the
- * plog_handler (below).  So we assign values now */
-
-sigargs->daemonize = daemonize;
-sigargs->debug     = debug;
-sigargs->config    = config;
-
-#ifdef HAVE_LIBPCAP
-
-/* Spawn a thread to 'sniff' syslog traffic (sagan-plog.c).  This redirects syslog
-   traffic to the /dev/log socket.  This needs "root" access,  so we drop priv's
-   after this thread is started */
-
-if ( config->plog_flag ) { 
-
-if ( pthread_create( &pcap_thread, NULL, (void *)plog_handler, sigargs )) {
-
-        removelockfile(config);
-        sagan_log(config, 1, "[%s, line %d] Error creating libpcap handler thread.", __FILE__, __LINE__);
-        }
-
-sleep(1); 	/* Sleep to avoid race between main() and plog thread 
-		   plog thread needs "root" rights before sagan_droppriv().
-		   In some cases main() run sagan_droppriv() before thread
-		   can complete - Champ Clark - 07/20/2011 */
-			
-}
-#endif
-
-sagan_droppriv(config, runas);		/* Become the Sagan user */
-sagan_log(config, 0, "---------------------------------------------------------------------------");
-
-/* Open sagan alert file */
-
-if (( config->sagan_alert_stream = fopen(config->sagan_alert_filepath, "a" )) == NULL ) {
-removelockfile(config);
-sagan_log(config, 1, "[%s, line %d] Can't open %s!", __FILE__, __LINE__, config->sagan_alert_filepath);
-}
-
-sagan_log(config, 0, "Max Output Threads   : %" PRIu64 "", config->max_output_threads);
-sagan_log(config, 0, "Max Processor Threads: %" PRIu64 "", config->max_processor_threads);
-
-sagan_log(config, 0, "");
-
-#if defined(HAVE_LIBMYSQLCLIENT_R) || defined(HAVE_LIBPQ)
-if ( config->dbtype ) { 
-
-config->endian = checkendian();
-
-db_connect(config);
-
-get_sensor_id( debug, config ); 
-sagan_log(config, 0, "Sensor ID            : %d", config->sensor_id);
-counters->cid = get_cid( debug, config ) + 1; 
-
-snprintf(sqltmp, sizeof(sqltmp), "SELECT MAX(cid) FROM event WHERE sid=%d", config->sensor_id);
-sql=sqltmp;
-sqlout = db_query(debug,  config, sql);
-
-sagan_log(config, 0, "Next CID             : %" PRIu64 "", counters->cid);
-
-/* Check the event table and compare sensor.last_cid with event_cid.  If there's a 
- * mismatch,  we correct it  - Champ Clark 03/30/2012 */ 
-
-if ( atol(sqlout) != counters->cid ) {
-   sagan_log(config, 2, "Inconsistent cid information for sid=%d.  Recovering by rolling forward to cid=%d", config->sensor_id, atol(sqlout) );
-   counters->cid = atol(sqlout);
-   record_last_cid(debug, config, counters);
-   }
-
-counters->last_cid = counters->cid;	/* Use to determine if a change has happened in sagan_siganl.c */
-} 
-
-#endif
-
-#ifdef HAVE_LIBPRELUDE
-
-if ( config->sagan_prelude_flag ) {
-
-sagan_log(config, 0, "Prelude profile: %s", config->sagan_prelude_profile);
-sagan_log(config, 0, "");  /* libprelude dumps some information.  This is to make it pretty */
-
-PreludeInit(config);
-}
-
-#endif
-
-#ifdef HAVE_LIBDNET
-
-if ( config->sagan_unified2_flag ) { 
-
-sagan_log(config, 0, "");
-sagan_log(config, 0, "Unified2 file: %s", config->unified2_filepath);
-sagan_log(config, 0, "Unified2 limit: %dM", config->unified2_limit  / 1024 / 1024 );
-Unified2InitFile( config );
-
-}
-
-#endif
-
-
-sagan_log(config, 0, "");
-
-sagan_log(config, 0, "");
-sagan_log(config, 0, " ,-._,-. 	-*> Sagan! <*-");
-sagan_log(config, 0, " \\/)\"(\\/	Version %s", VERSION);
-sagan_log(config, 0, "  (_o_)	Champ Clark III & The Quadrant InfoSec Team [quadrantsec.com]");
-sagan_log(config, 0, "  /   \\/)	Copyright (C) 2009-2012 Quadrant Information Security, et al.");
-sagan_log(config, 0, " (|| ||) 	Using PCRE version: %s", pcre_version());
-sagan_log(config, 0, "  oo-oo     Sagan is processing events.....");
-sagan_log(config, 0, "");
-
-/* Become a daemon if requested */
-
-if ( daemonize )
-{
-sagan_log(config, 0, "Becoming a daemon!");
-
-pid_t pid = 0;
-setsid();
-pid = fork();
-if (pid == 0) {} else { exit(0); }
-} 
-
-/* Create the signal handlers thread _after_ the fork() so it can properly 
- * handly signals - Champ Clark III - 06/13/2011 */
-
-if ( pthread_create( &sig_thread, NULL, (void *)sig_handler, sigargs )) {
-        removelockfile(config);
-        sagan_log(config, 1, "[%s, line %d] Error creating signal handler thread.", __FILE__, __LINE__);
-        }
-
-
-/* We don't want the key_handler() if we're in daemon mode! */
-
-if (!daemonize) { 
-
-if (pthread_create( &key_thread, NULL, (void *)key_handler, config )) { ;
-	removelockfile(config);
-	sagan_log(config, 1, "[%s, line %d] Error creating key_handler thread.", __FILE__, __LINE__);
-	}
-
-}
-
-/* We do this after forking so init scripts can complete */
-
-/* Check lock file _after_ thread.  If you don't it'll retreive the wrong pid
- * and incorrectly believe there is a stale lock file if --daemon */
-
-checklockfile(config);
-
-sagan_log(config, 0, "Attempting to open syslog FIFO (%s).", config->sagan_fifo);
-
-if ( fd == 0 ) fd = open(config->sagan_fifo, O_RDONLY);
-
-sagan_log(config, 0, "Successfully opened FIFO (%s).", config->sagan_fifo);
-
-while(1) { 
-
-                if(fd < 0) {
-		        removelockfile(config);
-			sagan_log(config, 1, "[%s, line %d] Error opening in FIFO! %s (Errno: %d)", __FILE__, __LINE__, config->sagan_fifo, errno);
-                        }
-
-                i = read(fd, &c, 1);
-                
-		 if(i < 0) {
-  	                removelockfile(config);
-                        sagan_log(config, 1, "[%s, line %d] Error reading FIFO! %s (Errno: %d)", __FILE__, __LINE__, config->sagan_fifo, errno);
-                        }
-
-		/* Error on reading (FIFO writer left) and we have no 
-		 * previous error state. */
-
-		if (i == 0 && fifoerr == 0 ) { 
-		   sagan_log(config, 0, "FIFO closed (writer exited). Will start processing when writer resumes.");
-		   fifoerr=1;
-		   }
-
-		/* If previous state was error,  now we see data,
-		 * then the write is back online. */
-
-		if ( fifoerr == 1 && i == 1 )  { 
-		   sagan_log(config, 0,"FIFO writer detected, resuming...");
-		   fifoerr=0;  /* Rest error state */
-		   }
-
-		/* FIFO will return null and eat CPU.  We sleep to avoid
-		 * this until the FIFO writer comes back online */
-
-		if ( fifoerr == 1 ) sleep(1);  
-
-                snprintf(syslogtmp, sizeof(syslogtmp), "%c", c);
-                strncat(syslogstring, syslogtmp, 1); 
-
-		if ( c == '\n' || c == '\r' ) 
-                {
-
-		counters->sagantotal++;
-		syslog_host = strtok_r(syslogstring, "|", &tok);
-
-		/* If we're using DNS (and we shouldn't be!),  we start DNS checks and lookups
-		 * here.  We cache both good and bad lookups to not over load our DNS server(s).
-		 * The only way DNS cache can be cleared is to restart Sagan */
-
-		if (config->syslog_src_lookup ) { 
-		   if ( inet_pton(AF_INET, syslog_host, &(sa.sin_addr)) == 0 ) { 	/* Is inbound a valid IP? */
-		      dns_flag=0;							
-
-		   for(i=0; i <= counters->dns_cache_count ; i++) {			/* Check cache first */
-		      if (!strcmp( dnscache[i].hostname, syslog_host)) { 
-		          syslog_host = dnscache[i].src_ip;
-		          dns_flag=1;
-		          } 
-		   }
-
-		   /* If entry was not found in cache,  look it up */
-
-		   if ( dns_flag == 0 ) { 
-
-		      /* Do a DNS lookup */
-		      snprintf(src_dns_lookup, sizeof(src_dns_lookup), "%s", dns_lookup(config, syslog_host));
-		    
-		      /* Invalid lookups get the config->sagan_host value */
-
-		      if (!strcmp(src_dns_lookup, "0" )) { 
-		         snprintf(src_dns_lookup, sizeof(src_dns_lookup), "%s", config->sagan_host);
-		  	 counters->dns_miss_count++; 
-			 }
-
-
-                    /* Add entry to DNS Cache */
-
-                    dnscache = (_SaganDNSCache *) realloc(dnscache, (counters->dns_cache_count+1) * sizeof(_SaganDNSCache));
-                    snprintf(dnscache[counters->dns_cache_count].hostname, sizeof(dnscache[counters->dns_cache_count].hostname), "%s", syslog_host);
-                    snprintf(dnscache[counters->dns_cache_count].src_ip, sizeof(dnscache[counters->dns_cache_count].src_ip), "%s",  src_dns_lookup);
-                    counters->dns_cache_count++; 
-                    syslog_host = src_dns_lookup; 
-
-		    }
-	       }
-		
-	} else { 
-
-	        /* We check to see if values from our FIFO are valid.  If we aren't doing DNS related 
-		 * stuff (above),  we start basic check with the syslog_host */
-
-                if (syslog_host == NULL || inet_pton(AF_INET, syslog_host, &(sa.sin_addr)) == 0  ) { 
-                   syslog_host = config->sagan_host;
-                   if ( !fifoerr ) sagan_log(config, 0, "Sagan received a malformed 'host' (replaced with %s)", config->sagan_host);
-                   }
-	       }
-
-		/* We know check the rest of the values */
-
-		syslog_facility=strtok_r(NULL, "|", &tok);
-		if ( syslog_facility == NULL ) { 
-		   syslog_facility = "SAGAN: FACILITY ERROR";
-		   if ( !fifoerr ) sagan_log(config, 0, "Sagan received a malformed 'facility'");
-		   }
-
-                syslog_priority=strtok_r(NULL, "|", &tok);
-		if ( syslog_priority == NULL ) { 
-		   syslog_priority = "SAGAN: PRIORITY ERROR";
-		   if ( !fifoerr ) sagan_log(config, 0, "Sagan received a malformed 'priority'");
-		   }
-
-                syslog_level=strtok_r(NULL, "|", &tok);
-		if ( syslog_level == NULL ) { 
-		   syslog_level = "SAGAN: LEVEL ERROR";
-		   if ( !fifoerr ) sagan_log(config, 0, "Sagan received a malformed 'priority'");
-		   }
-
-                syslog_tag=strtok_r(NULL, "|", &tok);
-                if ( syslog_tag == NULL ) {
-                   syslog_tag = "SAGAN: TAG ERROR";
-                   if ( !fifoerr ) sagan_log(config, 0, "Sagan received a malformed 'tag'");
-                   }
-
-                syslog_date=strtok_r(NULL, "|", &tok);
-                if ( syslog_date == NULL ) {
-                   syslog_date = "SAGAN: DATE ERROR";
-                   if ( !fifoerr ) sagan_log(config, 0, "Sagan received a malformed 'date'");
-                   }
-
-                syslog_time=strtok_r(NULL, "|", &tok);
-                if ( syslog_time == NULL ) {
-                   syslog_time = "SAGAN: TIME ERROR";
-                   if ( !fifoerr ) sagan_log(config, 0, "Sagan received a malformed 'time'");
-                   }
-
-                syslog_program=strtok_r(NULL, "|", &tok);
-                if ( syslog_program == NULL ) {
-                   syslog_program = "SAGAN: PROGRAM ERROR";
-                   if ( !fifoerr ) sagan_log(config, 0, "Sagan received a malformed 'program'");
-                   } else {
-                   syslog_msg=syslog_program + strlen(syslog_program) + 1;
-                   }
-
-                if ( syslog_msg == NULL ) {
-                   syslog_msg = "SAGAN: MESSAGE ERROR";
-                   if ( !fifoerr ) sagan_log(config, 0, "Sagan received a malformed 'message'\n");
-
-		   /* If the message is lost,  all is lost.  Typically,  you don't lose part of the message,  
-		    * it's more likely to lose all  - Champ Clark III 11/17/2011 */
-
-		   counters->sagan_log_drop++; 
-
-                   }
-
-
-               /* Strip any \n or \r from the syslog_msg */
-
-               if ( strcspn ( syslog_msg, "\n" ) < strlen(syslog_msg) ) 
-                  syslog_msg[strcspn ( syslog_msg, "\n" )] = '\0';
-
-
-if (debug->debugsyslog) sagan_log(config, 0, "%s|%s|%s|%s|%s|%s|%s|%s|%s", syslog_host, syslog_facility, syslog_priority, syslog_level, syslog_tag, syslog_date, syslog_time, syslog_program, syslog_msg);
-
-
-		/* Search for matches */
-
-		/* First we search for 'program' and such.   This way,  we don't waste CPU
-		 * time with pcre/content.  */
-
-		for(b=0; b < counters->rulecount; b++) {
-
-                match = 0; program=""; facility=""; syspri=""; level=""; tag=""; content="";
-
-                if ( strcmp(rulestruct[b].s_program, "" )) {
-                   snprintf(tmpbuf, sizeof(tmpbuf), "%s", rulestruct[b].s_program);
-                   ptmp = strtok_r(tmpbuf, "|", &tok2);
-                   match=1;
-                   while ( ptmp != NULL ) {
-                       if (!strcmp(ptmp, syslog_program)) match=0; 
-                       ptmp = strtok_r(NULL, "|", &tok2);
-                       }
-                }
-
-                if ( strcmp(rulestruct[b].s_facility, "" )) {
-                   snprintf(tmpbuf, sizeof(tmpbuf), "%s", rulestruct[b].s_facility);
-                   ptmp = strtok_r(tmpbuf, "|", &tok2);
-                   match=1;
-                   while ( ptmp != NULL ) {
-                      if (!strcmp(ptmp, syslog_facility)) match=0;
-                      ptmp = strtok_r(NULL, "|", &tok2);
-                      }
-                }
-
-                if ( strcmp(rulestruct[b].s_syspri, "" )) {
-                   snprintf(tmpbuf, sizeof(tmpbuf), "%s", rulestruct[b].s_syspri);
-                   ptmp = strtok_r(tmpbuf, "|", &tok2);
-                   match=1;
-                   while ( ptmp != NULL ) {
-                      if (!strcmp(ptmp, syslog_priority)) match=0;
-                      ptmp = strtok_r(NULL, "|", &tok2);
-                      }
-                  }
-
-                if ( strcmp(rulestruct[b].s_level, "" )) {
-                   snprintf(tmpbuf, sizeof(tmpbuf), "%s", rulestruct[b].s_level);
-                   ptmp = strtok_r(tmpbuf, "|", &tok2);
-                   match=1;
-                   while ( ptmp != NULL ) {
-                      if (!strcmp(ptmp, syslog_level)) match=0;
-                       ptmp = strtok_r(NULL, "|", &tok2);
-                       }
-                   }
-
-                if ( strcmp(rulestruct[b].s_tag, "" )) {
-                   snprintf(tmpbuf, sizeof(tmpbuf), "%s", rulestruct[b].s_tag);
-                   ptmp = strtok_r(tmpbuf, "|", &tok2);
-                   match=1;
-                   while ( ptmp != NULL ) {
-                      if (!strcmp(ptmp, syslog_tag)) match=0;
-                      ptmp = strtok_r(NULL, "|", &tok2);
-                      }
-                }
-
-		/* If there has been a match above,  or NULL on all,  then we continue with 
-		 * PCRE/content search */
-
-		/* Search via strstr (content:) */
-
-		if ( match == 0 ) { 
-
-		if ( rulestruct[b].content_count != 0 ) { 
-
-		for(z=0; z<rulestruct[b].content_count; z++) {
-
-		   /* If case insensitive */
-		   if ( rulestruct[b].s_nocase == 1 ) {
-		      snprintf(syslog_msg_origtmp,  sizeof(syslog_msg_origtmp), "%s", syslog_msg);
-		      syslog_msg_case=syslog_msg_origtmp;
-		      s_content_case=rulestruct[b].s_content[z];
-		      toupperc(syslog_msg_case);
-		      toupperc(s_content_case); 
-		      if (strstr(syslog_msg_case, s_content_case )) pcrematch++;
-		      } else { 
-
-		   /* If case sensitive */
-		   if (strstr(syslog_msg, rulestruct[b].s_content[z] )) pcrematch++;
-		   }
-		  }
-		 }
-	      
-	       
-	       	/* Search via PCRE */
-
-		if ( rulestruct[b].pcre_count != 0 ) { 
-
-		   for(z=0; z<rulestruct[b].pcre_count; z++) {
-		
-		   rc = pcre_exec( rulestruct[b].re_pcre[z], rulestruct[b].pcre_extra[z], syslog_msg, (int)strlen(syslog_msg), 0, 0, ovector, OVECCOUNT);
-
-                   }  /* End of pcre if */
-
-                if ( rc == 1 ) {
-                   pcrematch++;
-                   }
-                }
-		
-		} /* End of content: & pcre */
-	
-		/* if you got match */
-
-		if ( pcrematch == rulestruct[b].pcre_count + rulestruct[b].content_count ) 
-		   {
-		
-		   if ( match == 0 ) { 
-
-		   counters->saganfound++;
-
-		   ip_src=NULL;
-		   ip_dst=NULL;
-		   dst_port=0;
-		   src_port=0;
-		   
-		   username=NULL;
-		   uid=NULL;
-
-#ifdef HAVE_LIBLOGNORM
-		   if ( rulestruct[b].normalize == 1 && counters->liblognormtoload_count != 0 ) 
-		      {
-		      str = es_newStrFromCStr(syslog_msg, strlen(syslog_msg ));
-		      ln_normalize(ctx, str, &lnevent);
-                	if(lnevent != NULL) {
-                        es_emptyStr(str);
-                        ee_fmtEventToRFC5424(lnevent, &str);
-                        cstr = es_str2cstr(str, NULL);
-			
-			if ( debug->debugnormalize ) sagan_log(config, 0, "Normalize output: %s", cstr);
-
-			propName = es_newStrFromBuf("src-ip", 6);
-			if((field = ee_getEventField(lnevent, propName)) != NULL) {
-			   str = ee_getFieldValueAsStr(field, 0);
-			   ip_src = es_str2cstr(str, NULL);
-			   }
-
-			propName = es_newStrFromBuf("dst-ip", 6);
-		        if((field = ee_getEventField(lnevent, propName)) != NULL) {
-			   str = ee_getFieldValueAsStr(field, 0);
-			   ip_dst = es_str2cstr(str, NULL);
-			   }
-
-			propName = es_newStrFromBuf("src-port", 8);
-                        if((field = ee_getEventField(lnevent, propName)) != NULL) {
-                           str = ee_getFieldValueAsStr(field, 0);
-			   cstr = es_str2cstr(str, NULL);
-			   src_port = atoi(cstr);
-                           }
-
-                        propName = es_newStrFromBuf("dst-port", 8);
-                        if((field = ee_getEventField(lnevent, propName)) != NULL) {
-                           str = ee_getFieldValueAsStr(field, 0);
-                           cstr = es_str2cstr(str, NULL);
-			   dst_port = atoi(cstr);
-                           }
-
-                        propName = es_newStrFromBuf("username", 8);
-                        if((field = ee_getEventField(lnevent, propName)) != NULL) {
-                           str = ee_getFieldValueAsStr(field, 0);
-                           username = es_str2cstr(str, NULL);
-			   }
-
-                        propName = es_newStrFromBuf("uid", 3);
-                        if((field = ee_getEventField(lnevent, propName)) != NULL) {
-                           str = ee_getFieldValueAsStr(field, 0);
-                           uid = es_str2cstr(str, NULL);
-                           }
-
-                        propName = es_newStrFromBuf("src-host", 8);
-                        if((field = ee_getEventField(lnevent, propName)) != NULL) {
-                           str = ee_getFieldValueAsStr(field, 0);
-			   snprintf(ipbuf_src, sizeof(ipbuf_src), "%s", dns_lookup(config, es_str2cstr(str, NULL)));
-			   ip_src=ipbuf_src;
-                           }
-
-                       propName = es_newStrFromBuf("dst-host", 8);
-                        if((field = ee_getEventField(lnevent, propName)) != NULL) {
-                           str = ee_getFieldValueAsStr(field, 0);
-			   snprintf(ipbuf_dst, sizeof(ipbuf_dst), "%s", dns_lookup(config, es_str2cstr(str, NULL)));
-			   ip_dst=ipbuf_dst;
-
-                           }
-
-                        free(cstr);
-                        ee_deleteEvent(lnevent);
-                        lnevent = NULL;
-                	}
-
-}
-#endif
-
-/* Normalization always over rides parse_ip/parse_port */ 
-
-if ( rulestruct[b].normalize == 0 ) {
-
-	/* parse_ip && parse_port - Simple means of parsing */
-
- if ( rulestruct[b].s_find_ip == 1 ) {
-
-   snprintf(fip, sizeof(fip), "%s", parse_ip_simple(syslog_msg));
-
-   if (strcmp(fip,"0")) {
-      ip_src = fip; ip_dst = syslog_host;
-       } else {
-      ip_src = syslog_host; ip_dst = config->sagan_host;
-      }
-        } else {
-      ip_src = syslog_host; ip_dst = config->sagan_host;
- }
-
-if ( rulestruct[b].s_find_port == 1 ) {
-   src_port = parse_port_simple(config, syslog_msg);
-    } else {
-   src_port = config->sagan_port;
-   }
-}
-
-if ( ip_src == NULL ) ip_src=syslog_host;
-if ( ip_dst == NULL ) ip_dst=syslog_host;
-
-if ( src_port == 0 ) src_port=config->sagan_port;
-if ( dst_port == 0 ) dst_port=rulestruct[b].dst_port;  
-
-snprintf(s_msg, sizeof(s_msg), "%s", rulestruct[b].s_msg);
-
-if (username != NULL ) {
-    snprintf(tmpbuf, sizeof(tmpbuf), " [%s]", username);
-    strlcat(s_msg, tmpbuf, sizeof(s_msg));
-    }
-
-if (uid != NULL ) { 
-   snprintf(tmpbuf, sizeof(tmpbuf), " [uid: %s]", uid);
-   strlcat(s_msg, tmpbuf, sizeof(s_msg));
-   }
-
-/* We don't want 127.0.0.1,  so remap it to something more useful */
-
-if (!strcmp(ip_src, "127.0.0.1" )) ip_src=config->sagan_host;
-if (!strcmp(ip_dst, "127.0.0.1" )) ip_dst=config->sagan_host;
-
-/*********************************************************/
-/* After - Similar to thresholding,  but the opposite    */
-/* direction - ie - alert _after_ X number of events     */
-/*********************************************************/
-
-if ( rulestruct[b].after_src_or_dst != 0 ) {
-     
-      after_log_flag=1;
-
-      t = time(NULL);
-      now=localtime(&t);
-      strftime(timet, sizeof(timet), "%s",  now);
-
-      /* After by source IP address */
-
-      if ( rulestruct[b].after_src_or_dst == 1 ) {
-         after_flag = 0;
-
-         for (i = 0; i < after_count_by_src; i++ ) {
-             if (!strcmp( afterbysrc[i].ipsrc, ip_src ) && !strcmp(afterbysrc[i].sid, rulestruct[b].s_sid )) {
-                after_flag=1;
-                afterbysrc[i].count++;
-                after_oldtime_src = atol(timet) - afterbysrc[i].utime;
-                afterbysrc[i].utime = atol(timet);
-                if ( after_oldtime_src > rulestruct[b].after_seconds ) {
-                   afterbysrc[i].count=1;
-                   afterbysrc[i].utime = atol(timet);
-                   after_log_flag=1;
-                   }
-
-                if ( rulestruct[b].after_count < afterbysrc[i].count )
-                        {
-                        after_log_flag = 0;
-                        sagan_log(config, 0, "After SID %s by source IP address. [%s]", afterbysrc[i].sid, ip_src);
-                        counters->after_total++;
-                        }
-
-            }
-          }
-	}
-
-
-         /* If not found,  add it to the array */
-
-         if ( after_flag == 0 ) {
-            afterbysrc = (after_by_src *) realloc(afterbysrc, (after_count_by_src+1) * sizeof(after_by_src));
-            snprintf(afterbysrc[after_count_by_src].ipsrc, sizeof(afterbysrc[after_count_by_src].ipsrc), "%s", ip_src);
-            snprintf(afterbysrc[after_count_by_src].sid, sizeof(afterbysrc[after_count_by_src].sid), "%s", rulestruct[b].s_sid );
-            afterbysrc[after_count_by_src].count = 1;
-            afterbysrc[after_count_by_src].utime = atol(timet);
-            after_count_by_src++;
-            }
-
-      /* After by destination IP address */
-
-        if ( rulestruct[b].after_src_or_dst == 2 ) {
-            
-	    after_flag = 0;
-
-        /* Check array for matching src / sid */
-
-        for (i = 0; i < after_count_by_dst; i++ ) {
-                if (!strcmp( afterbydst[i].ipdst, ip_dst ) && !strcmp(afterbydst[i].sid, rulestruct[b].s_sid )) {
-                   after_flag=1;
-                   afterbydst[i].count++;
-                   after_oldtime_src = atol(timet) - afterbydst[i].utime;
-                   afterbydst[i].utime = atol(timet);
-                      if ( after_oldtime_src > rulestruct[b].after_seconds ) {
-                         afterbydst[i].count=1;
-                         afterbydst[i].utime = atol(timet);
-                         after_log_flag=1;
-                         }
-
-        if ( rulestruct[b].after_count < afterbydst[i].count ) {
-           after_log_flag = 0;
-           sagan_log(config, 0, "After SID %s by destination IP address. [%s]", afterbysrc[i].sid, ip_dst);
-           counters->after_total++;
-           }
-         }
-       }
-
-        /* If not found,  add it to the array */
-
-        if ( after_flag == 0 ) {
-           afterbydst = (after_by_dst *) realloc(afterbydst, (after_count_by_dst+1) * sizeof(after_by_dst));
-           snprintf(afterbydst[after_count_by_dst].ipdst, sizeof(afterbydst[after_count_by_dst].ipdst), "%s", ip_dst);
-           snprintf(afterbydst[after_count_by_dst].sid, sizeof(afterbydst[after_count_by_dst].sid), "%s", rulestruct[b].s_sid );
-           afterbydst[after_count_by_dst].count = 1;
-           afterbydst[after_count_by_dst].utime = atol(timet);
-           after_count_by_dst++;
-           }
-        }
-
-} /* End of After */
-
-
-thresh_log_flag = 0;
-
-/*********************************************************/
-/* Thresh holding                                        */
-/*********************************************************/
-
-if ( rulestruct[b].threshold_type != 0 && after_log_flag == 0) { 
-
-      t = time(NULL);
-      now=localtime(&t);
-      strftime(timet, sizeof(timet), "%s",  now);
-
-      /* Thresholding by source IP address */
-		      
-      if ( rulestruct[b].threshold_src_or_dst == 1 ) { 
-         thresh_flag = 0;
-	
-	 /* Check array for matching src / sid */
-
-	 for (i = 0; i < thresh_count_by_src; i++ ) { 
-	     if (!strcmp( threshbysrc[i].ipsrc, ip_src ) && !strcmp(threshbysrc[i].sid, rulestruct[b].s_sid )) { 
-	        thresh_flag=1;
-		threshbysrc[i].count++;
-		thresh_oldtime_src = atol(timet) - threshbysrc[i].utime;
-		threshbysrc[i].utime = atol(timet);
-		if ( thresh_oldtime_src > rulestruct[b].threshold_seconds ) {
-		   threshbysrc[i].count=1;
-		   threshbysrc[i].utime = atol(timet);
-		   thresh_log_flag=0;
-		   }
-
-		if ( rulestruct[b].threshold_count < threshbysrc[i].count ) 
-			{ 
-			thresh_log_flag = 1;
-			sagan_log(config, 0, "Threshold SID %s by source IP address. [%s]", threshbysrc[i].sid, ip_src);
-			counters->threshold_total++;
-			}
-  			
-	     }
-	 }
-	
-	 /* If not found,  add it to the array */
-	
-	 if ( thresh_flag == 0 ) { 
-	    threshbysrc = (thresh_by_src *) realloc(threshbysrc, (thresh_count_by_src+1) * sizeof(thresh_by_src));
-            snprintf(threshbysrc[thresh_count_by_src].ipsrc, sizeof(threshbysrc[thresh_count_by_src].ipsrc), "%s", ip_src);
-	    snprintf(threshbysrc[thresh_count_by_src].sid, sizeof(threshbysrc[thresh_count_by_src].sid), "%s", rulestruct[b].s_sid );
-	    threshbysrc[thresh_count_by_src].count = 1;
-	    threshbysrc[thresh_count_by_src].utime = atol(timet);
-	    thresh_count_by_src++;
-	    }
-	 }
-
-      /* Thresholding by destination IP address */
-
-	if ( rulestruct[b].threshold_src_or_dst == 2 ) {
-            thresh_flag = 0;
-       
-	/* Check array for matching src / sid */
-
-	for (i = 0; i < thresh_count_by_dst; i++ ) {
-		if (!strcmp( threshbydst[i].ipdst, ip_dst ) && !strcmp(threshbydst[i].sid, rulestruct[b].s_sid )) {
-                   thresh_flag=1;
-                   threshbydst[i].count++;
-                   thresh_oldtime_src = atol(timet) - threshbydst[i].utime;
-                   threshbydst[i].utime = atol(timet);
-                      if ( thresh_oldtime_src > rulestruct[b].threshold_seconds ) {
-                         threshbydst[i].count=1;
-                         threshbydst[i].utime = atol(timet);
-                         thresh_log_flag=0;
-                         }
-
-	if ( rulestruct[b].threshold_count < threshbydst[i].count ) {
-	   thresh_log_flag = 1;
-	   sagan_log(config, 0, "Threshold SID %s by destination IP address. [%s]", threshbysrc[i].sid, ip_dst);
-	   counters->threshold_total++;
-	   }
-         }
-       }
-
-	/* If not found,  add it to the array */
-
-	if ( thresh_flag == 0 ) {
-           threshbydst = (thresh_by_dst *) realloc(threshbydst, (thresh_count_by_dst+1) * sizeof(thresh_by_dst));
-           snprintf(threshbydst[thresh_count_by_dst].ipdst, sizeof(threshbydst[thresh_count_by_dst].ipdst), "%s", ip_dst);
-           snprintf(threshbydst[thresh_count_by_dst].sid, sizeof(threshbydst[thresh_count_by_dst].sid), "%s", rulestruct[b].s_sid );
-           threshbydst[thresh_count_by_dst].count = 1;
-           threshbydst[thresh_count_by_dst].utime = atol(timet);
-           thresh_count_by_dst++;
-           }
-        }
-}  /* End of thresholding */
-
-
-/****************************************************************************/
-/* Populate the SaganEvent array with the information needed.  This info    */
-/* will be passed to the threads.  No need to populate it _if_ we're in a   */
-/* threshold state.                                                         */
-/****************************************************************************/
-
-/* Check for thesholding & "after" */
-
-if ( thresh_log_flag == 0 && after_log_flag == 0 ) { 
-
-threadid++;
-if ( threadid >= MAX_THREADS ) threadid=0;
-
-msgslot++;
-if ( msgslot >= MAX_MSGSLOT ) msgslot=0;
-
-/* We can't use the pointers from our syslog data.  If two (or more) event's
- * fire at the same time,  the two alerts will have corrupted information 
- * (due to threading).   So we populate the SaganEvent[threadid] with the
- * var[msgslot] information. - Champ Clark 02/02/2011
- */
-
-snprintf(sysmsg[msgslot], sizeof(sysmsg[msgslot]), "%s", syslog_msg);
-snprintf(syslog_timetmp[msgslot], sizeof(syslog_timetmp[msgslot]), "%s", syslog_time);
-snprintf(syslog_datetmp[msgslot], sizeof(syslog_datetmp[msgslot]), "%s", syslog_date);
-snprintf(syslog_leveltmp[msgslot], sizeof(syslog_leveltmp[msgslot]), "%s", syslog_level);
-snprintf(syslog_tagtmp[msgslot], sizeof(syslog_tagtmp[msgslot]), "%s", syslog_tag);
-snprintf(syslog_facilitytmp[msgslot], sizeof(syslog_facilitytmp[msgslot]), "%s", syslog_facility);
-snprintf(syslog_programtmp[msgslot], sizeof(syslog_programtmp[msgslot]), "%s", syslog_program);
-snprintf(ip_srctmp[msgslot], sizeof(ip_srctmp[msgslot]), "%s", ip_src);
-snprintf(ip_dsttmp[msgslot], sizeof(ip_dsttmp[msgslot]), "%s", ip_dst);
-snprintf(syslog_hosttmp[msgslot], sizeof(syslog_hosttmp[msgslot]), "%s", syslog_host);
-snprintf(s_msgtmp[msgslot], sizeof(s_msgtmp[msgslot]), "%s", s_msg);
-src_porttmp[msgslot] = src_port; 
-dst_porttmp[msgslot] = dst_port;
-
-SaganEvent[threadid].ip_src    =       ip_srctmp[msgslot];
-SaganEvent[threadid].ip_dst    =       ip_dsttmp[msgslot];
-SaganEvent[threadid].dst_port  =       dst_porttmp[msgslot];
-SaganEvent[threadid].src_port  =       src_porttmp[msgslot];
-SaganEvent[threadid].found     =       b;
-SaganEvent[threadid].program   =       syslog_programtmp[msgslot];
-SaganEvent[threadid].message   =       sysmsg[msgslot];
-SaganEvent[threadid].time      =       syslog_timetmp[msgslot];
-SaganEvent[threadid].date      =       syslog_datetmp[msgslot];
-SaganEvent[threadid].f_msg     =       s_msgtmp[msgslot]; 
-SaganEvent[threadid].facility  =       syslog_facilitytmp[msgslot];
-SaganEvent[threadid].priority  =       syslog_leveltmp[msgslot];
-SaganEvent[threadid].tag       =       syslog_tagtmp[msgslot];
-SaganEvent[threadid].host      =       syslog_hosttmp[msgslot];
-SaganEvent[threadid].event_time_sec = 	time(NULL);
-
-SaganEvent[threadid].debug     = 	debug;
-SaganEvent[threadid].config    = 	config;
-
-}
-
-/***************************************************************************/
-/* Output plugins that cannot be threaded and require little I/O (almost   */
-/* no I/O blocking) - IE - unified2/ASCII alerts                           */
-/***************************************************************************/
-
-/* If thresholding isn't happening,  send to output plugins */
-
-if ( thresh_log_flag == 0 && after_log_flag == 0 ) { 
-
-sagan_alert( &SaganEvent[threadid] );	/* 
-
-/* Log to unified2 output (if enabled and have libdnet). */
-
-#ifdef HAVE_LIBDNET
-if ( config->sagan_unified2_flag ) {
-if ( thresh_log_flag == 0 && after_log_flag == 0 ) Sagan_Unified2( &SaganEvent[threadid] );
-if ( thresh_log_flag == 0 && after_log_flag == 0 ) Sagan_Unified2LogPacketAlert( &SaganEvent[threadid] );
-}
-#endif
-
-/****************************************************************************/
-/* Output Plugin Threads - This is for output plugins like SQL/etc that     */
-/* might cause some I/O blocking                                            */
-/****************************************************************************/
-
-if ( config->output_thread_flag )  {
-
-if (  counters->thread_output_counter < config->max_output_threads ) {
-
-        counters->thread_output_counter++;
-
-if ( pthread_create ( &output_id[threadid], &thread_output_attr, (void *)sagan_output, &SaganEvent[threadid] ) ) {
-	removelockfile(config);
-        sagan_log(config, 1, "[%s, line %d] Error creating output-plugin thread", __FILE__, __LINE__);
-	} 
-} else { 
-	counters->sagan_output_drop++;
-	sagan_log(config, 0, "[%s, line %d] sagan_output(): Out of threads\n", __FILE__, __LINE__);
-  }
-}
-
-
-/****************************************************************************/
-/* Log Processors that might take valuable CPU time (Geo IP, etc)           */
-/* Not sure if this section will remain here or not.  We might end up with  */
-/* "processors" and "preprocessors" - Champ Clark III 04/04/2012            */
-/****************************************************************************/
-
-if ( config->processor_thread_flag ) { 
-
-if ( counters->thread_processor_counter < config->max_processor_threads ) {
-
-        counters->thread_processor_counter++;
-
-if ( pthread_create ( &processor_id[threadid], &thread_processor_attr, (void *)sagan_processor, &SaganEvent[threadid] ) ) {
-        removelockfile(config);
-        sagan_log(config, 1, "[%s, line %d] Error creating processor-plugin thread", __FILE__, __LINE__);
-        }
-} else {
-        counters->sagan_processor_drop++;
-        sagan_log(config, 0, "[%s, line %d] sagan_processor(): Out of threads\n", __FILE__, __LINE__);
-}
-}
-
-
-
-  } /* End of threshold */
- } /* End of match */
-} /* End of pcre match */
-
-match=0;  /* Reset match! */
-pcrematch=0;
-rc=0;
-} /* End for for loop */
-
-syslogstring[0]='\0';		/* Reset values */
-syslogtmp[0]='\0';
-}
-
-} /* End of while(1) */
-
-} /* End of main */
-
-

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-12-17 16:04:27 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-01-do-not-include-lognorm-private-header.patch

=== modified file 'AUTHORS'
--- AUTHORS	2011-12-17 16:04:27 +0000
+++ AUTHORS	2014-11-22 20:03:11 +0000
@@ -1,4 +1,3 @@
-
 Primary code development was done by Champ Clark III ([e-mail]).
 
 Many people have contributed to the project.  I'm hoping in the future

=== modified file 'FAQ'
--- FAQ	2011-12-17 16:04:27 +0000
+++ FAQ	2014-11-22 20:03:11 +0000
@@ -1,4 +1,1 @@
-For the Sagan FAQ,  please see:
-
-https://wiki.quadrantsec.com/bin/view/Main/SaganFAQ
-
+See http://sagan.quadrantsec.com 

=== modified file 'INSTALL'
--- INSTALL	2012-04-16 22:33:24 +0000
+++ INSTALL	2014-11-22 20:03:11 +0000
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,8 +12,8 @@
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2014-11-22 20:03:11 +0000
@@ -0,0 +1,805 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.  Generated from Makefile.in by configure.
+
+# 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.
+
+
+
+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)/sagan
+pkgincludedir = $(includedir)/sagan
+pkglibdir = $(libdir)/sagan
+pkglibexecdir = $(libexecdir)/sagan
+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 = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
+subdir = .
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in COPYING TODO compile config.guess \
+	config.sub depcomp install-sh missing
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+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_$(V))
+am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+am__v_at_1 = 
+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 = ${SHELL} /home/champ/code/release-1.0.0RC4/sagan/missing aclocal-1.14
+AMTAR = $${TAR-tar}
+AM_DEFAULT_VERBOSITY = 1
+AUTOCONF = ${SHELL} /home/champ/code/release-1.0.0RC4/sagan/missing autoconf
+AUTOHEADER = ${SHELL} /home/champ/code/release-1.0.0RC4/sagan/missing autoheader
+AUTOMAKE = ${SHELL} /home/champ/code/release-1.0.0RC4/sagan/missing automake-1.14
+AWK = gawk
+CC = gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2
+CPP = gcc -E
+CPPFLAGS = 
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+EGREP = /bin/grep -E
+ENDIAN = little
+EXEEXT = 
+GREP = /bin/grep
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+JSON_C_CFLAGS = -I/usr/include/json 
+JSON_C_LIBS = -ljson 
+LDFLAGS = 
+LIBESTR_CFLAGS = 
+LIBESTR_LIBS = -L/usr/lib -lestr 
+LIBLOGNORM_CFLAGS = 
+LIBLOGNORM_LIBS = -L/usr/lib -llognorm -lestr 
+LIBOBJS = 
+LIBS = -ldnet -llognorm -lestr -lm -lpthread -lpcre 
+LTLIBOBJS = 
+MAINT = #
+MAKEINFO = ${SHELL} /home/champ/code/release-1.0.0RC4/sagan/missing makeinfo
+MKDIR_P = /bin/mkdir -p
+OBJEXT = o
+PACKAGE = sagan
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_URL = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PKG_CONFIG = /usr/bin/pkg-config
+PKG_CONFIG_LIBDIR = 
+PKG_CONFIG_PATH = 
+SET_MAKE = 
+SHELL = /bin/sh
+STRIP = 
+VERSION = 1.0.0-RC4
+abs_builddir = /home/champ/code/release-1.0.0RC4/sagan
+abs_srcdir = /home/champ/code/release-1.0.0RC4/sagan
+abs_top_builddir = /home/champ/code/release-1.0.0RC4/sagan
+abs_top_srcdir = /home/champ/code/release-1.0.0RC4/sagan
+ac_ct_CC = gcc
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = $${TAR-tar} chof - "$$tardir"
+am__untar = $${TAR-tar} xf -
+bindir = ${exec_prefix}/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = ${prefix}/include
+infodir = ${datarootdir}/info
+install_sh = ${SHELL} /home/champ/code/release-1.0.0RC4/sagan/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
+localstatedir = ${prefix}/var
+mandir = ${datarootdir}/man
+mkdir_p = $(MKDIR_P)
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+prefix = /usr/local
+program_transform_name = s,x,x,
+psdir = ${docdir}
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+srcdir = .
+sysconfdir = ${prefix}/etc
+target = x86_64-unknown-linux-gnu
+target_alias = 
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
+top_build_prefix = 
+top_builddir = .
+top_srcdir = .
+AUTOMAKE_OPIONS = foreign no-dependencies
+SUBDIRS = src
+INCLUDES = @INCLUDES@
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu 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: # $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): # $(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: # $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+
+# 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 mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-data-local
+
+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
+
+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 \
+	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-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local 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 pdf pdf-am ps ps-am tags \
+	tags-am uninstall uninstall-am
+
+
+# Install BFD include file, and others that it needs.
+#install-data-local: 
+#	@$(NORMAL_INSTALL)
+#	$(mkinstalldirs) $(sysconfdir)
+#	$(INSTALL_DATA)sagan.conf $(sysconfdir)/sagan.conf
+
+install-data-local:
+	test -z "$(DESTDIR)$(sysconfdir)" || /bin/mkdir -p "$(DESTDIR)$(sysconfdir)"
+	test -f "$(DESTDIR)$(sysconfdir)/sagan.conf" || $(INSTALL_DATA) etc/sagan.conf "$(DESTDIR)$(sysconfdir)/sagan.conf"
+	test -z "$(DESTDIR)$(sbindir)" || /bin/mkdir -p "$(DESTDIR)$(sbindir)"
+	$(INSTALL) -d "$(DESTDIR)$(mandir)/man8"
+	$(INSTALL) -m 644 etc/sagan.8 "$(DESTDIR)$(mandir)/man8"
+	$(INSTALL) -m 755 src/sagan "$(DESTDIR)$(sbindir)/sagan"
+	$(INSTALL) -d "$(DESTDIR)/var/log/sagan"
+	$(INSTALL) -d "$(DESTDIR)/var/run/sagan"
+	@echo ""
+	@echo "------------------------------------------------------------------------------"
+	@echo "Sagan has been installed! You still need to do a few more things before your"
+	@echo "up and running.  For more information, see:"
+	@echo "https://wiki.quadrantsec.com/twiki/bin/view/Main/SaganInstall"
+	@echo "------------------------------------------------------------------------------"
+	@echo ""
+
+# 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:

=== modified file 'Makefile.am'
--- Makefile.am	2011-12-17 16:04:27 +0000
+++ Makefile.am	2014-11-22 20:03:11 +0000
@@ -21,8 +21,8 @@
 	@echo ""
 	@echo "------------------------------------------------------------------------------"
 	@echo "Sagan has been installed! You still need to do a few more things before your"
-	@echo "up and running. See https://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO for"
-	@echo "more information."
+	@echo "up and running.  For more information, see:"
+	@echo "https://wiki.quadrantsec.com/twiki/bin/view/Main/SaganInstall"
 	@echo "------------------------------------------------------------------------------"
 	@echo ""
 

=== modified file 'Makefile.in'
--- Makefile.in	2011-12-17 16:04:27 +0000
+++ Makefile.in	2014-11-22 20:03:11 +0000
@@ -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.
@@ -15,6 +14,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,12 +79,13 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	TODO config.guess config.sub depcomp install-sh missing
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in COPYING TODO compile config.guess \
+	config.sub depcomp install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -49,30 +94,73 @@
 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 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive
+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=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+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 = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(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,'; \
@@ -100,10 +188,14 @@
   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@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -128,10 +220,17 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JSON_C_CFLAGS = @JSON_C_CFLAGS@
+JSON_C_LIBS = @JSON_C_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
+LIBESTR_LIBS = @LIBESTR_LIBS@
+LIBLOGNORM_CFLAGS = @LIBLOGNORM_CFLAGS@
+LIBLOGNORM_LIBS = @LIBLOGNORM_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
@@ -143,6 +242,9 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -208,9 +310,9 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -237,22 +339,20 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@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:  $(am__configure_deps) 
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
@@ -261,22 +361,25 @@
 	-rm -f config.h stamp-h1
 
 # 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.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# 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//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	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; \
@@ -291,57 +394,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-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: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+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 \
@@ -357,12 +415,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(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; \
@@ -374,15 +427,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(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-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
@@ -391,9 +440,31 @@
 	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)
@@ -429,13 +500,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || 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; \
@@ -464,36 +532,42 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__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 -c >$(distdir).tar.xz
-	$(am__remove_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__remove_distdir)
+	$(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__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__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
@@ -504,8 +578,8 @@
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -515,17 +589,19 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	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 --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -548,13 +624,21 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(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:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@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)"; \
@@ -585,10 +669,15 @@
 
 installcheck: installcheck-recursive
 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:
@@ -669,24 +758,23 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local 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 pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	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-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local 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 pdf pdf-am ps ps-am tags \
+	tags-am uninstall uninstall-am
 
 
 # Install BFD include file, and others that it needs.
@@ -707,8 +795,8 @@
 	@echo ""
 	@echo "------------------------------------------------------------------------------"
 	@echo "Sagan has been installed! You still need to do a few more things before your"
-	@echo "up and running. See https://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO for"
-	@echo "more information."
+	@echo "up and running.  For more information, see:"
+	@echo "https://wiki.quadrantsec.com/twiki/bin/view/Main/SaganInstall"
 	@echo "------------------------------------------------------------------------------"
 	@echo ""
 

=== modified file 'NEWS'
--- NEWS	2011-12-17 16:04:27 +0000
+++ NEWS	2014-11-22 20:03:11 +0000
@@ -1,2 +1,1 @@
-
-For News,  see http://sagan.quadrantsec.com
+See http://sagan.quadrantsec.com

=== modified file 'README'
--- README	2012-04-16 22:33:24 +0000
+++ README	2014-11-22 20:03:11 +0000
@@ -11,17 +11,20 @@
 compatibility with rule management software (oinkmaster/pulledpork/etc)
 and allows Sagan to correlate log events with your Snort IDS/IPS 
 system. Since Sagan can write to Snort IDS/IPS databases via 
-unified2/barnyard2 or direct SQL access, it is compatible with all 
-Snort "consoles". For example, Sagan is compatible with Snorby 
-[http://www.snorby.org], Sguil [http://sguil.sourceforge.net], BASE, 
- and the Prelude IDS framework! (to name a few).
+unified2/barnyard2, it is compatible with all Snort "consoles". 
+For example, Sagan is compatible with Snorby [http://www.snorby.org],
+Sguil [http://sguil.sourceforge.net], BASE, and the Prelude IDS 
+framework! (to name a few).
 
 Sagan supports many different output formats,  log normalization 
-(via liblognorm),  script execution on event and automatic firewall
-support via "Snortsam" (see http://www.snortsam.net).  
+(via liblognorm),  GeoIP detection, script execution on event and
+automatic firewall support via "Snortsam" 
+(see http://www.snortsam.net).  
 
 For more information, please visit the Sagan web site: 
 http://sagan.quadrantsec.com. 
 
+If you're looking for Sagan rules on Github,  they are located at:
 
+https://github.com/beave/sagan-rules
 

=== modified file 'aclocal.m4'
--- aclocal.m4	2011-03-17 15:18:58 +0000
+++ aclocal.m4	2014-11-22 20:03:11 +0000
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 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.
@@ -11,15 +11,231 @@
 # 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.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+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, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <[e-mail]>.
+#
+# 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 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# 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.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
+# 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,
@@ -31,10 +247,10 @@
 # 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.11'
+[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.11.1], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,22 +266,22 @@
 # 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.11.1])dnl
+[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, 2003, 2005  Free Software Foundation, Inc.
+# 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/../..'.
+# $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
@@ -84,7 +300,7 @@
 #
 # 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
+# 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,
@@ -110,22 +326,19 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# 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.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[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
@@ -144,16 +357,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# 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.
 
-# serial 10
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# 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
@@ -163,7 +374,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# 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
@@ -176,12 +387,13 @@
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" 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=])
+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],
@@ -189,8 +401,9 @@
   # 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'.
+  # 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.
@@ -229,16 +442,16 @@
     : > 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 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # 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"
+    # 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
+    # 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
@@ -247,16 +460,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # 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
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    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}
@@ -304,7 +517,7 @@
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# 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
@@ -314,34 +527,39 @@
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[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, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# 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.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # 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
@@ -354,7 +572,7 @@
     # 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
+    # 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.
@@ -366,21 +584,19 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # 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
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -398,7 +614,7 @@
 # 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
+# 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],
@@ -408,18 +624,21 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# 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.
 
-# serial 16
-
 # 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])
 # -----------------------------------------------
@@ -432,7 +651,7 @@
 # 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.62])dnl
+[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
@@ -461,31 +680,40 @@
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[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], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+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
+[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)
+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([AM_PROG_MKDIR_P])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:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+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
@@ -496,34 +724,78 @@
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_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)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_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)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_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
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+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
-])
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+
+# 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: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell [e-mail] 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: <http://www.gnu.org/software/coreutils/>.
+
+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.
@@ -545,7 +817,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# 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,
@@ -564,16 +836,14 @@
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# 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.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -587,16 +857,50 @@
 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, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# 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.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -614,7 +918,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# 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
@@ -641,15 +945,12 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# 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.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -657,11 +958,10 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# 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
@@ -674,63 +974,35 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  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_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# 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.
 
-# serial 4
-
 # _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)])
+[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)])])
@@ -741,24 +1013,82 @@
 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, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# 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.
 
-# serial 5
-
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -769,32 +1099,40 @@
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# 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 (
-   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
-   rm -f conftest.file
-   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
-
+   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
@@ -804,9 +1142,85 @@
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+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,
@@ -814,34 +1228,32 @@
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# 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
+# 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
+# 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'.
+# 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, 2008  Free Software Foundation, Inc.
+# 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.
 
-# serial 2
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -849,24 +1261,22 @@
 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, 2005  Free Software Foundation, Inc.
+# 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.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# 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
@@ -876,75 +1286,114 @@
 # 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.
-AM_MISSING_PROG([AMTAR], [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='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-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 <conftest.tar])
-    grep GrepMe conftest.dir/file >/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])])
+  [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 <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi