Merge branch 'v7-stable'

4 files changed, 19 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 05a63d2b..d31afd02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,6 +105,13 @@ Version 7.3.0  [devel] 2012-10-09
   This was achieved by somewhat reducing the robustness of the zip archive.
   This is controlled by the new action parameter "VeryReliableZip".
 ----------------------------------------------------------------------------
+Version 7.2.5  [v7-stable] 2013-01-??
+- build system cleanup (thanks to Michael Biebl for this!)
+- bugfix: omelasticsearch did not properly compile on some platforms
+  due to missing libmath. Thanks to Michael Biebl for the fix
+- bugfix: invalid DST handling under Solaris
+  Thanks to Scott Severtson for the patch.
+----------------------------------------------------------------------------
 Version 7.2.4  [v7-stable] 2012-12-07
 - enhance: permit RFC3339 timestamp in local log socket messages
   Thanks to Sebastien Ponce for the patch.
@@ -410,6 +417,8 @@ Version 6.6.1  [v6-stable] 2012-10-??
   low-end case always happens in user space, without need for kernel
   support as we can always directly aquire the lock - there is no
   contention at all).
+- bugfix: invalid DST handling under Solaris
+  Thanks to Scott Severtson for the patch.
 ---------------------------------------------------------------------------
 Version 6.6.0  [v6-stable] 2012-10-22
 This starts a new stable branch, based on the 6.5.x series, plus:
@@ -1083,6 +1092,8 @@ Version 5.10.2  [V5-STABLE], 201?-??-??
   ... actually, they are microseconds. So the fractional part of the 
   timestamp was not properly formatted.
   Thanks to Marius Tomaschewski for the bug report and the patch idea.
+- bugfix: invalid DST handling under Solaris
+  Thanks to Scott Severtson for the patch.
 ---------------------------------------------------------------------------
 Version 5.10.1  [V5-STABLE], 2012-10-17
 - bugfix: imuxsock and imklog truncated head of received message
diff --git a/configure.ac b/configure.ac
index 6646f8ab..f2fffc34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -243,22 +243,7 @@ AM_CONDITIONAL(ENABLE_GSSAPI, test x$enable_gssapi_krb5 = xyes)
 
 
 # multithreading via pthreads
-AC_ARG_ENABLE(pthreads,
-        [AS_HELP_STRING([--enable-pthreads],[Enable multithreading via pthreads @<:@default=yes@:>@])],
-        [case "${enableval}" in
-         yes) enable_pthreads="yes" ;;
-          no) enable_pthreads="no" ;;
-           *) AC_MSG_ERROR(bad value ${enableval} for --enable-pthreads) ;;
-         esac],
-        [enable_pthreads=yes]
-)
-
-if test "x$enable_pthreads" = "xno"; then
-	AC_MSG_ERROR(rsyslog v3+ does no longer support single threading mode -- use a previous version for that);
-fi
-
-if test "x$enable_pthreads" != "xno"; then
-  AC_CHECK_HEADERS(
+AC_CHECK_HEADERS(
     [pthread.h],
     [
       AC_CHECK_LIB(
@@ -279,8 +264,7 @@ if test "x$enable_pthreads" != "xno"; then
       )
     ],
     [AC_MSG_FAILURE([pthread is missing])]
-  )
-fi
+)
 
 AC_CHECK_FUNCS(
     [pthread_setschedparam],
@@ -711,13 +695,13 @@ AC_SUBST(SNMP_LIBS)
 AC_ARG_ENABLE(uuid,
         [AS_HELP_STRING([--enable-uuid],[Enable support for uuid generation @<:@default=yes@:>@])],
         [case "${enableval}" in
-         yes) enable_elasticsearch="yes" ;;
-          no) enable_elasticsearch="no" ;;
+         yes) enable_uuid="yes" ;;
+          no) enable_uuid="no" ;;
            *) AC_MSG_ERROR(bad value ${enableval} for --enable-uuid) ;;
          esac],
         [enable_uuid=yes]
 )
-if test "x$enable_elasticsearch" = "xyes"; then
+if test "x$enable_uuid" = "xyes"; then
 	PKG_CHECK_MODULES([LIBUUID], [uuid])
 	AC_DEFINE(USE_LIBUUID, 1, [Define if you want to enable libuuid support])
 fi
@@ -736,6 +720,7 @@ AC_ARG_ENABLE(elasticsearch,
 )
 if test "x$enable_elasticsearch" = "xyes"; then
 	PKG_CHECK_MODULES([CURL], [libcurl])
+	LT_LIB_M
 fi
 AM_CONDITIONAL(ENABLE_ELASTICSEARCH, test x$enable_elasticsearch = xyes)
 
diff --git a/plugins/omelasticsearch/Makefile.am b/plugins/omelasticsearch/Makefile.am
index 059bdf8a..ba85a896 100644
--- a/plugins/omelasticsearch/Makefile.am
+++ b/plugins/omelasticsearch/Makefile.am
@@ -4,6 +4,6 @@ pkglib_LTLIBRARIES = omelasticsearch.la
 omelasticsearch_la_SOURCES = omelasticsearch.c cJSON/cjson.c  cJSON/cjson.h
 omelasticsearch_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
 omelasticsearch_la_LDFLAGS = -module -avoid-version
-omelasticsearch_la_LIBADD =  $(CURL_LIBS)
+omelasticsearch_la_LIBADD =  $(CURL_LIBS) $(LIBM)
 
 EXTRA_DIST = 
diff --git a/runtime/datetime.c b/runtime/datetime.c
index 53bc1657..c03abab9 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -77,7 +77,7 @@ timeval2syslogTime(struct timeval *tp, struct syslogTime *t)
 		/* Solaris uses a different method of exporting the time zone.
 		 * It is UTC - localtime, which is the opposite sign of mins east of GMT.
 		 */
-		lBias = -(daylight ? altzone : timezone);
+		lBias = -(tm->tm_isdst ? altzone : timezone);
 #	elif defined(__hpux)
 		lBias = tz.tz_dsttime ? - tz.tz_minuteswest : 0;
 #	else