[Libreoffice] [PATCH] Fix configure check for BerkleyDB where db_create is macro

Petr Mladek pmladek at suse.cz
Fri Jan 21 11:56:08 PST 2011


Hi,

first, I am sorry that I committed the older proposed fix and caused
Bernhard troubles. Unfortunately, the problem went somehow out of my 
radar until I saw Bernhard's bug
https://bugs.freedesktop.org/show_bug.cgi?id=33230

Gökçen Eraslan píše v Po 10. 01. 2011 v 10:16 +0000:
> Perşembe 06 Ocak 2011 günü (saat 20:03:28) Petr Mladek şunları yazmıştı:
> > Hi,
> > 
> > this fixed the problem described in the attached mail.
> > 
> > Gökçen, Robert, could you please test it and sign it out for
> > libreoffice-3-3 branch?
> > 
> 
> No, I only have __db185_open_4008 symbol in libdb.so, here is the result:

Could you please try the attached patch?

I would like to get it into the libreoffice-3-3 branch for LO-3.3.1
release. Thus the diff is a bit conservative. The idea is:

+ keep check for "dbopen" and "__db185_open" to keep backward
  compatibility with  3.3.0 release
+ add check for "db_create" that seems to work for most people
+ add check for "db_create_4008",  "db_create_4007", "db_create_4004" that 
  should work for db.h using macros; the version numbers 4008, 4007, 4004 come
  from the used directory suffixes 4.8, 4.7, 4.4; I have seen these problems
  with macros only with the 4.x version
+ do not use AC_CHECK_FUNC; IMHO, it just duplicate the AC_CHECK_LIB and is not
  really necessary; I did not want to duplicate the long lists of fallbacks.

It is a bit ugly but it should know in all known cases.

It works here. Also really try the fallback when needed, ...


Best Regards,
Petr


More information about the LibreOffice mailing list