[rsyslog] experimental 1.19.9 tarball

[theinric at redhat.com]

Sorry, didn't realised.

diff -up rsyslog-1.19.9/configure.ac.orig rsyslog-1.19.9/configure.ac
--- rsyslog-1.19.9/configure.ac.orig    2007-10-11 11:56:05.000000000 +0200
+++ rsyslog-1.19.9/configure.ac 2007-10-11 11:57:33.000000000 +0200
@@ -254,17 +254,23 @@ if test "x$enable_mysql" = "xyes"; then
      [mysql/mysql.h],,
      [AC_MSG_FAILURE([MySQL is missing])]
    )
-  AC_SUBST(LIBS_TMP,[$LIBS])
-  AC_SEARCH_LIBS(
-    [mysql_init],
+  AC_CHECK_PROG(
+    [HAVE_MYSQL_CONFIG],
+    [mysql_config],
+    [yes],,,
+  )
+  if test "x${HAVE_MYSQL_CONFIG}" != "xyes"; then
+    AC_MSG_FAILURE([mysql_config not found in PATH])
+  fi
+  AC_CHECK_LIB(
      [mysqlclient],
+    [mysql_init],
      [mysql_cflags=`mysql_config --cflags`
       mysql_libs=`mysql_config --libs`
      ],
      [AC_MSG_FAILURE([MySQL library is missing])],
      [`mysql_config --libs`]
    )
-  AC_SUBST(LIBS,[$LIBS_TMP])
  fi
  AM_CONDITIONAL(ENABLE_MYSQL, test x$enable_mysql = xyes)
  AC_SUBST(mysql_cflags)

Rainer Gerhards wrote:
> The mailing list won't let attachments of anything other than (I think,
> .txt) through (if at all). You can mail me privately, I'll post it (and
> I bet you've also a site to post to, feel free to do that).
> 
> Thanks again all for your help - muuuuuch appreciated!
> 
> Rainer
> 
>> -----Original Message-----
>> From: rsyslog-bounces at lists.adiscon.com [mailto:rsyslog-
>> bounces at lists.adiscon.com] On Behalf Of theinric at redhat.com
>> Sent: Thursday, October 11, 2007 12:37 PM
>> To: rsyslog-users
>> Subject: Re: [rsyslog] experimental 1.19.9 tarball
>>
>> Hi,
>>
>> just a few additions to Michael's patch.
>>
>> Rainer Gerhards wrote:
>>> Hi Michael,
>>>
>>> many thanks, this is a *very* useful patch, much appreciated. I just
>>> applied it an re-created the experimental tarball. The new version
> is
>>> available at the previous url at
>>>
>>> http://download.rsyslog.com/rsyslog/rsyslog-1.19.9.tar.gz
>>>
>>> I think I'll release tomorrow if I do not hear any show stopper
> until
>>> then.
>>>
>>> Thanks all for testing, comments and patches! (I so far applied
>>> Michael's only, is it seems to cover everything else - but I'll do
>>> further review now) :)
>>>
>>> Rainer
>>>
>>> On Wed, 2007-10-10 at 19:33 +0200, Michael Biebl wrote:
>>>> 2007/10/10, Rainer Gerhards <rgerhards at hq.adiscon.com>:
>>>>> Excellent - from initial feedback I received, there still seems to
>> be
>>>>> some minor nits. I'll re-release the pilot soon, will post then.
>>>> Ok, I had some time to review the changes. All in all I like, how
>> it's
>>>> done know.
>>>>
>>>> Attached you will find a patch which will cleanup/fix some issues:
>>>>
>>>> 1.) fix failing compilation of ommysql plugin (s/ommysql-
>> config.h/config.h/)
>>>> 2.) fix mysql configure check (although the default is no, we did
>>>> check for the mysql devel files)
>>>> 3.) Create a separate Makefile.am for the doc files. This cleans up
>>>> the toplevel Makefile.am considerably and makes it much more
>> readable
>>>> and maintainable. I guess everyone agrees ;-)
>>>> 3b) Assign the html doc files to html_DATA. This means, they are
>>>> installed to $(hmtdir), which by autoconf standards is
>>>> $(prefix)/share/doc/$packagename/. If that is not wanted, just name
>>>> the variable html_files e.g.
>>>> 4.) Reformat the SOURCES line to make it better readable and
>> maintainable.
>>>> The patch is against the experimental 1.19.9 tarball.
>>>> It only patches configure.ac/Makefile.am, so you have to run
>>>> "autoreconf -vfi" to rebuild the auto* files.
>>>>
>>>> Please review and apply.
>>>>
>>>> Cheers,
>>>> Michael
>>>> _______________________________________________
>>>> rsyslog mailing list
>>>> http://lists.adiscon.net/mailman/listinfo/rsyslog
>>> _______________________________________________
>>> rsyslog mailing list
>>> http://lists.adiscon.net/mailman/listinfo/rsyslog
> 
> _______________________________________________
> rsyslog mailing list
> http://lists.adiscon.net/mailman/listinfo/rsyslog