diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-13 15:55:46 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-13 15:55:46 +0200 |
commit | fec2041e037426ac227ee619b59629e059099d05 (patch) | |
tree | af59860c7b037b2ca0d7ce85a2384ab1b5ca3e04 /configure.ac | |
parent | 6511278082a7e1e9602385cd24cdb5e363cb702f (diff) | |
parent | ef9722ec87c8a7ddb2d499c1e7863475d8790a94 (diff) | |
download | rsyslog-fec2041e037426ac227ee619b59629e059099d05.tar.gz rsyslog-fec2041e037426ac227ee619b59629e059099d05.tar.xz rsyslog-fec2041e037426ac227ee619b59629e059099d05.zip |
Merge branch 'v3-stable' into v4-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 3e24c62f..608ca15b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[4.2.0],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[4.2.1],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_MACRO_DIR([m4]) @@ -402,7 +402,7 @@ if test "x$enable_mysql" = "xyes"; then [yes],,, ) if test "x${HAVE_MYSQL_CONFIG}" != "xyes"; then - AC_MSG_FAILURE([mysql_config not found in PATH]) + AC_MSG_FAILURE([mysql_config not found in PATH - usually a package named mysql-dev, libmysql-dev or similar, is missing - install it to fix this issue]) fi AC_CHECK_LIB( [mysqlclient], |