[syslog-ng] syslog-ng 2.1: upstream libdbi does NOT provide pkgconfig .pc file

[Balazs Scheidler]

On Thu, 2008-09-18 at 10:50 +0200, Wolfram Schlich wrote:
> * Wolfram Schlich <lists at wolfram.schlich.org> [2008-09-18 10:46]:
> > What other changes were made to the upstream libdbi
> > to form the balabit version?
> 
> $ diff -urN libdbi-0.8.2 libdbi8-0.8.2bb2 | wc -l
> 93688
> $
> 
> ARGH! :(
> 
> So this can be considered a fork.
> The worst case scenario imagineable for the
> open source community.
> 
> Why oh why? Please enlighten us :)

Most of it is probably the configure script. I'd be happy to clear out
the libdbi pecularities wrt syslog-ng 2.1 as well.

My patches have already been integrated in libdbi since, so it should be
easy to port to the latest libdbi upstream.

The things that we did in our version:
  * we renamed dbi to dbi-0.8 in order not to clash with a local libdbi
package, this affected:
    * .deb packages
    * dbi-0.8.pc
    * various files the package installs /usr/lib/libdbd-0.8 for
instance
  * currently the only things that prevents syslog-ng to be compiled
against the upstream libdbi are:
    * we should search for dbi.pc instead of dbi-0.8.pc
    * the dbi package does not install the .pc file automatically (e.g.
there's no Makefile rule to install that), nevertheless the file is
generated by its configure script.

This patch against syslog-ng will make it look for the upstream libdbi:

diff --git a/configure.in b/configure.in
index a523776..568b698 100644
--- a/configure.in
+++ b/configure.in
@@ -182,7 +182,7 @@ dnl libdbi headers/libraries
 dnl ***************************************************************************
 
 AC_CHECK_LIB(dl, dlsym, DL_LIBS="-ldl")
-PKG_CHECK_MODULES(LIBDBI, dbi-0.8 >= $LIBDBI_MIN_VERSION,, LIBDBI_LIBS="")
+PKG_CHECK_MODULES(LIBDBI, dbi >= $LIBDBI_MIN_VERSION,, LIBDBI_LIBS="")
 
 
 dnl ***************************************************************************

After that it should work.

Please note that we submitted a couple of patches against
libdbi/libdbi-drivers, so make sure that you use the latest CVS version.

-- 
Bazsi