1076 Commits

Author SHA1 Message Date
Rainer Gerhards
88f06516b5 bugfix: ommysql did not work when gnutls was enabled
as it turned out, this was due to a check for GnuTLS functions
with the side-effect that
AC_CHECK_LIB, by default, adds the lib to LIBS, if there is no
explicit action, what was the case here. So everything was now
linked against GnuTLS, which in turn made ommysql fail.

Thanks to Thomas D. (whissi) for the analysis of the ommysql/gnutls
problem and Thomas Heinrich for pointing out that AC_CHECK_LIB might
be the culprit.
2015-07-27 16:59:17 +02:00
3b13693430 Tools: Man pages for tools were generated even with --disable-generate-man-pages
Man pages are not generated anymore when "--disable-generate-man-pages" is
configured. Also changed man-page rulepatterns makefile. The method
using $< refering to the prerequisite did not work proberly on FreeBSD.

closes https://github.com/rsyslog/rsyslog/issues/387
2015-07-24 10:21:58 +00:00
4cd2d4ff53 KSI: Limiting libksi version support from 3.2.2.0 up to 3.3.0.0 2015-07-13 05:03:48 -07:00
Rainer Gerhards
74c3813f6e bump version number 2015-07-06 15:17:48 +02:00
Rainer Gerhards
24d459aa40 prepare for 8.11.0 release 2015-06-26 14:27:41 +02:00
Rainer Gerhards
24f13309f3 KSI support: add plumbing 2015-06-26 08:57:34 +02:00
Rainer Gerhards
5a2b40e1ba testbench: proper cleanup 2015-05-22 13:48:32 +02:00
Rainer Gerhards
3bb425dfe7 working on make distcheck work-around 2015-05-20 13:04:31 +02:00
Rainer Gerhards
bdfbfc292d bump version number 2015-05-19 14:36:35 +02:00
Rainer Gerhards
b648ea53d5 prepare for 8.10.0 release 2015-05-19 10:50:17 +02:00
Rainer Gerhards
23d04ecaa2 omhttpfs: some cleanup
removed duplicate json-c configure check
commented out unused code --> less compiler warnings
2015-05-19 09:56:45 +02:00
Rainer Gerhards
b0b5aa0598 Merge branch 'omhttpfs' of https://github.com/sskaje/rsyslog into sskaje-omhttpfs
Conflicts:
	configure.ac
2015-05-18 10:40:28 +02:00
Rainer Gerhards
21674039db use gnutls_certificate_type_set_priority() only if available
The gnutls_certificate_type_set_priority function is deprecated
and not available in recent GnuTLS versions. However, there is no
doc how to properly replace it with gnutls_priority_set_direct.
A lot of folks have simply removed it, when they also called
gnutls_set_default_priority. This is what we now also do. If
this causes problems or someone has an idea of how to replace
the deprecated function in a better way, please let us know!
In any case, we use it as long as it is available and let
not insult us by the deprecation warnings.
2015-05-18 10:33:39 +02:00
Rainer Gerhards
23c5b3e1e6 replace deprecated GnuTLS functions with newer ones if available
closes https://github.com/rsyslog/rsyslog/issues/302
2015-05-18 10:33:39 +02:00
Rainer Gerhards
d848815b5e Merge branch 'master' of https://github.com/cooper6581/rsyslog into master-candidate 2015-05-04 08:17:44 +02:00
Thomas D
5a20fbbef0 Add an option to disable the generation of debug symbols
Not every user is interested in building software with debug symbols.
If the user has set the new "--disable-debug-symbols" option, we won't
set the appropriate compiler flag to generate debug symbols anymore.
2015-05-02 17:04:07 +02:00
Thomas D
5f5eca03a0 configure: We are now checking for rst2man, flex and yacc when building from git source
When you build from git source you always needed rst2man, flex and yacc (or a
replacement like bison). We only added checks to configure.

Due to this clarification configure option "--enable-generate-man-pages" is now
disabled per default but enforced when building from git source.

Link: http://lists.adiscon.net/pipermail/rsyslog/2015-April/thread.html#40318
2015-04-23 00:08:49 +02:00
Dustin Koupal
51b766c33c fixing json formatting when using json-c < 0.10 2015-04-22 18:15:01 +00:00
Bojan Smojver
813fb1c8f3 fix build on Centos5
The patch in 93dbfc3936524f1c1641d8709fb54e1c66d4f723 did not
properly work.
2015-04-08 15:21:57 +02:00
Bojan Smojver
93dbfc3936 fix build on Centos 5 2015-04-08 08:54:09 +02:00
Rainer Gerhards
1d25a46e7f bump version number to start new release cycle 2015-04-08 08:47:13 +02:00
Rainer Gerhards
34299b8d2c prepare for 8.9.0 release 2015-04-07 13:34:41 +02:00
Thomas D
1f4339df5f Add option to disable valgrind usage in testbench 2015-03-25 10:06:39 +01:00
Rainer Gerhards
abf5220320 build system: clarify use of --enable-valgrind option
see also http://lists.adiscon.net/pipermail/rsyslog/2015-March/040058.html
2015-03-25 09:54:10 +01:00
Rainer Gerhards
c57cd80828 bump version number to begin new release cycle 2015-02-24 17:35:41 +01:00
Rainer Gerhards
52fadb6102 prepare for 8.8.0 release 2015-02-24 17:11:50 +01:00
sskaje
534563a545 Merge branch 'master' into omhttpfs 2015-02-03 17:34:57 +08:00
Andrew Stormont
97b5ab5344 fix build problems on illuminos
closes https://github.com/rsyslog/rsyslog/issues/226
2015-02-02 09:54:30 +01:00
Rainer Gerhards
6c1eddef95 diagnostic: include build platfrom in rsyslogd -v output 2015-01-29 12:57:22 +01:00
Rainer Gerhards
1089b7513d bump version number 2015-01-14 18:00:40 +01:00
Gustavo Zacarias
b94be01ee5 configure.ac: make pgsql support cross-compile friendly
When cross-compiling pg_config shouldn't be expected to be in PATH
since normally this would point to distribution pgsql rather than cross,
which can be of a totally different architecture.

Change it so we can use ac_cv_prog_PG_CONFIG to point to the real one.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
2015-01-14 10:22:54 -03:00
Gustavo Zacarias
7806260253 configure.ac: make mysql support cross-compile friendly
When cross-compiling mysql_config shouldn't be expected to be in PATH
since normally this would point to distribution mysql rather than cross,
which can be of a totally different architecture.

Change it so we can use ac_cv_prog_MYSQL_CONFIG to point to the real one.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
2015-01-14 10:22:53 -03:00
Rainer Gerhards
14c39ff693 prepare for 8.7.0 release 2015-01-12 15:14:30 +01:00
Rainer Gerhards
98a0407323 omkafka: add module 2015-01-07 15:41:59 +01:00
sskaje
2bd9234e6d Merge branch 'omhttpfs' of github.com:sskaje/rsyslog into omhttpfs 2015-01-05 14:54:21 +08:00
sskaje
73e5ad06c8 Merge remote-tracking branch 'upstream/master' into omhttpfs 2015-01-05 14:52:10 +08:00
Janmejay Singh
ac4b978707 fixes json_bool test 2014-12-19 12:26:08 +01:00
Janmejay Singh
0db5aed1e5 mmnormalize regex test which expects regex support now runs only if liblognorm is built with regex support enabled
(commit edited to fix a mistake that unintentionally disturbed mmjsonparse)

(rebased to master-mmnormalize)
2014-12-17 11:40:47 +01:00
Rainer Gerhards
60527222a4 make sure we use the enhanced liblognorm 2014-12-17 11:40:17 +01:00
Janmejay Singh
29cdd505e2 added a json-c type replacement for json_bool which is not present in older version (for instance, 0.9, which debian squeeze uses) 2014-12-17 11:39:31 +01:00
Kevin Decherf
1c7ac835e6 configure.ac: fix the mix-up between enable_rsyslogd and enable_extended_tests 2014-12-16 12:46:49 +01:00
Rainer Gerhards
0a164f2972 Merge branch 'make-zlib-required' of https://github.com/Whissi/rsyslog into master-candidate 2014-12-16 12:34:10 +01:00
Thomas D
0a5e07b4a9 Remove zlib status from summary
Because zlib is considered as required since commit 6c5b6a2ec,
we don't need to show if zlib support is enabled or not in the
settings summary.
2014-12-12 16:12:01 +01:00
Thomas D
2709ac1256 Use pkg-config to check for zlib 2014-12-12 16:10:40 +01:00
sskaje
a704b77943 move omhttpfs to contrib/ 2014-12-12 18:01:35 +08:00
sskaje
540c26f4d6 make it work 2014-12-12 17:38:12 +08:00
sskaje
b46833a72d fix configure.ac 2014-12-12 11:36:20 +08:00
sskaje
80bd3c24bc add omhttpfs code 2014-12-12 11:16:25 +08:00
Rainer Gerhards
575398f9bd add support for systemd >= 209 library names 2014-12-10 07:55:51 +01:00
Tomas Heinrich
fddd1d98f4 Make liblogging-stdlog optional
Conflicts:
	configure.ac
	tools/rsyslogd.c
2014-12-03 15:33:26 +01:00