279 Commits

Author SHA1 Message Date
Rainer Gerhards
bd7542b515 Merge branch 'v4.3.2' (v4-beta) into v4-stable
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/Makefile.am
2009-08-21 10:19:56 +02:00
Rainer Gerhards
fec2041e03 Merge branch 'v3-stable' into v4-stable
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-07-13 15:55:46 +02:00
Rainer Gerhards
e27b56f0b7 better configure error message if mysql-devel is missing 2009-07-13 14:56:29 +02:00
Rainer Gerhards
538543f6d0 preparing for 3.22.1 2009-07-02 15:40:47 +02:00
Rainer Gerhards
eece1c3cd1 Merge branch 'v4-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-06-24 10:11:41 +02:00
Rainer Gerhards
5310ccee31 preparing for v4-stable 2009-06-22 19:22:24 +02:00
Rainer Gerhards
4f742a8e32 added config switch --enable-testbench=no to turn off testbench 2009-06-03 07:51:47 +02:00
Rainer Gerhards
25daa04902 added support for custom modules
... this provides some basic support to integrate extensions that
are not direct parts of rsyslog to be built during its build
process.
2009-06-02 07:44:07 +02:00
Rainer Gerhards
d7c98e7a6e Merge branch 'beta' into master
Conflicts:
	tests/Makefile.am
2009-05-28 18:34:17 +02:00
Rainer Gerhards
8d8befaeca Merge branch 'v3-stable' into beta
Conflicts:
	tests/Makefile.am
2009-05-28 18:23:53 +02:00
Rainer Gerhards
aaef9aa018 preparing for 4.3.1 2009-05-25 11:31:53 +02:00
Rainer Gerhards
362c006f0f relaxed GnuTLS version requirement to 1.4.0
after confirmation from the field that this version is sufficient.
I always thought so (I think I developed under 1.4.x), but had no
longer an environment to verify. Most imporantly, this means that
Centos users will have much less trouble building rsyslog/tls
support.
2009-05-19 09:18:51 +02:00
Michael Biebl
4f691b1e1d Cleanup configure.ac a little for better readability
- Use 2 new lines as separator between configure options.
- Remove forgotten copy&paste text.
- Reorder and move template configure option to the end.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:23 +02:00
Michael Biebl
541d7ad940 Improve ./configure output
Improve readability of the ./configure output by grouping relevant entries and
indenting them.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:22 +02:00
Michael Biebl
67974ecd5d Rename want_gssapi_krb5 to enable_gssapi_krb5
Be consistent and rename the configure variable want_gssapi_krb5 to
enable_gssapi_krb5.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:22 +02:00
Michael Biebl
460edfe27f Do not fail "make check" if omstdout is not enabled
Only run omod-if-array.sh and parsertest.sh test if omstdout plugin is
enabled.
Remove the comment and fix the help output for --enable-stdout (default
was "no", not "yes")

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:22 +02:00
Michael Biebl
735a02c656 Cleanup and typo fixes
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:22 +02:00
Michael Biebl
1bbd2b07f8 Add shave support
shave tranforms the verbose autotools output into a pretty Kbuild-like
one which makes it easier to spot warnings.

See also
http://damien.lespiau.name/blog/2009/02/18/shave-making-the-autotools-output-sane/
git clone git://git.lespiau.name/shave

By default, shave is disabled and you have to explicitly enable it via
./configure --enable-shave.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:21 +02:00
Rainer Gerhards
251e48a34c preparing for 4.1.7 2009-04-22 08:52:13 +02:00
Rainer Gerhards
6e410a76f6 preparing for 3.22.0 (move to stable) 2009-04-21 16:49:46 +02:00
Rainer Gerhards
9348f8b9c2 preparing for 4.3.0 release 2009-04-17 14:33:14 +02:00
Rainer Gerhards
85ccd6e9b7 Merge branch 'omprog' into nextmaster
Conflicts:
	ChangeLog
	runtime/rsyslog.h
2009-04-14 14:49:01 +02:00
Rainer Gerhards
f7f0902f65 Merge branch 'nextmaster' into oracle 2009-04-07 15:28:06 +02:00
Rainer Gerhards
829385ce40 Merge branch 'beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	doc/rsyslog_conf.html
2009-04-07 14:58:58 +02:00
Rainer Gerhards
0550512b28 preparing for 3.21.11 2009-04-03 15:06:15 +02:00
Rainer Gerhards
e92a0db46d Merge branch 'master' into oracle
Conflicts:
	Makefile.am
2009-04-02 12:19:44 +02:00
Rainer Gerhards
59d4a52c28 initial work on omprog, an output module to send messages to another program 2009-04-01 16:31:41 +02:00
Demo
e3f21521cd fixed some problems with "make check"
interestingly, they manifested on Debian, only, but potentially
existed on other platforms, too.
2009-03-31 22:10:37 +02:00
Rainer Gerhards
3b9fd5330a Merge branch 'master' into sol-test
Conflicts:
	tests/Makefile.am
2009-03-31 20:06:10 +02:00
Rainer Gerhards
3e3a9bc998 ported non-tcl based test suite to Solaris 2009-03-31 12:00:40 +02:00
Luis Fernando Muñoz Mejías
b8f10ad008 Include omoracle in the build system.
Add configure option to build the oracle support, named
--enable-oracle and fix the Makefile.am accordingly.
2009-03-25 18:48:36 +01:00
Rainer Gerhards
bbfa04fbe6 improved testing support
worked on ways to provide a better test suite:
- added -T rsyslogd command line option, enables to specify a directory
  where to chroot() into on startup. This is NOT a security feature but
  introduced to support testing. Thus, -T does not make sure chroot()
  is used in a secure way. (may be removed later)
- added omstdout module for testing purposes. Spits out all messages to
  stdout - no config option, no other features
- modified $ModLoad statement so that for modules whom's name starts with
  a dot, no path is prepended (this enables relative-pathes and should
  not break any valid current config)
2009-03-19 17:50:07 +01:00
Rainer Gerhards
208f4e107c added output module template
so far, this is mostly some documentation, but I hope that during
the process of creating output modules out of it we will get good
questions and thus can extend the template. In any case, it should
be better than what we had so far...
2009-03-16 17:26:45 +01:00
Rainer Gerhards
f664f3b28e Merge branch 'master' into rscript-func 2009-03-13 12:55:13 +01:00
Rainer Gerhards
4df8bb4e6b Merge branch 'beta'
Conflicts:
	doc/omrelp.html
2009-03-11 15:16:57 +01:00
Rainer Gerhards
ae7a01e137 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-03-11 15:15:34 +01:00
Rainer Gerhards
837b2b8d26 preparing for 4.1.5 release 2009-03-11 15:06:18 +01:00
Rainer Gerhards
2e388db9ac integrated various patches for solaris
Unfortunatley, I do not have the full list of contributors
available. The patch set was compiled by Ben Taylor, and I made
some further changes to adopt it to the news rsyslog branch. Others
provided much of the base work, but I can not find the names of the
original authors. If you happen to be one of them, please let me
know so that I can give proper credits.
2009-03-05 11:10:43 +01:00
Rainer Gerhards
924ceb305d Merge branch 'beta'
Conflicts:
	ChangeLog
	Makefile.am
	configure.ac
	doc/manual.html
2009-02-24 14:52:49 +01:00
Michael Biebl
21dddac141 Call PKG_PROG_PKG_CONFIG m4 macro unconditionally.
As all the calls to PKG_CHECK_MODULES are conditional, it can happen
that PKG_PROG_PKG_CONFIG is not called (i.e. if you not use
--enable-relp). So we enforce a check for pkg-config by adding it to the
global checks.
2009-02-24 14:42:07 +01:00
Rainer Gerhards
24a36fd142 decreased GNUtls version requirement
rsyslog also works with some 1.x.x versions, but I have not details any longer.
I developed with a v1 version for a while. To be on the save side, I request
2.0.0 (Michael Biebl was even more conservative with 2.4.2 - which he had
at hand - and so I am changing this now).
2009-02-24 14:38:53 +01:00
Michael Biebl
1b912a970c Improve mysql configure check (for unusual paths)
Remove AC_CHECK_HEADERS([mysql/mysql.h],...) as this was causing pain
for users where the mysql headers are not installed in the system include
directory. It was superfluous anyways, as we check for mysql_config and
set the include path to the correct directory.
Update ommysql.c to use #include <mysql.h>, as mysql_config will set the
include path to /path/to/include/mysql/ so <mysql/mysql.h> would not
work.
Remove errmsg.h include as it is not used.
2009-02-24 13:09:45 +01:00
Michael Biebl
1ca5268698 Separate macro file for atomic operations
To unclutter configure.ac and to make it easier re-usable, move the check
for atomic operations into a separate m4 macro file and call the macro
RS_ATOMIC_OPERATIONS (RS for RSyslog)
2009-02-24 13:09:45 +01:00
Michael Biebl
6685cd0c48 Split the m4 macros into a separate directory 2009-02-24 13:09:45 +01:00
Michael Biebl
e4620ab3a4 Use pkg-config for GnuTLS configure check
Use PKG_CHECK_MODULES instead of libgnutls-config to get the compilation
flags (vastly simpler). Set minimum version to 2.4.2, as that is the
oldest version I could test with.
2009-02-24 13:09:44 +01:00
Michael Biebl
0f03e5996a Call PKG_PROG_PKG_CONFIG m4 macro unconditionally.
As all the calls to PKG_CHECK_MODULES are conditional, it can happen
that PKG_PROG_PKG_CONFIG is not called (i.e. if you not use
--enable-relp). So we enforce a check for pkg-config by adding it to the
global checks.
2009-02-24 13:09:44 +01:00
Michael Biebl
1448e2486e make all cflags and libs variables uppercase
pkg-config uses uppercase for its _CFLAGS and _LIBS variable names.
So we follow suit and convert all _cflags and _libs variables to
uppercase for more consistency.
2009-02-24 13:09:44 +01:00
Rainer Gerhards
96e9bff86d preparing for 3.20.4 2009-02-09 16:46:39 +01:00
Michael Biebl
d742b251a6 bugfix: invalid ./configure settings for RFC3195
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-02-06 13:59:43 +01:00
Rainer Gerhards
051beeac57 prepared for 3.21.10 release 2009-02-02 14:36:32 +01:00