Parent Directory
| 
Revision Log
Fix Berkeley DB version detection: In #378105 I reported that 'apu-config --libs' prints a list of dependent libraries, where it should print nothing at all, since you should not explicitly link to dependent libraries in Debian. Tollef said he'd fix it. However, BDB version detection relies on this behavior, as it runs 'apu-config --libs', pulls out the -ldb* word, and compiles a test program with this. By adding 'apu-config --link-ld', which will be -laprutil-1, that will pull in libdb4.x regardless of whether 'apu-config --libs' prints it explicitly.
| 1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
| 2 | ## fix-bdb-version-detection.dpatch by <peter@p12n.org> |
| 3 | ## |
| 4 | ## DP: Do not rely on apu-config to print "-ldb4.3" or whatever - see #378105. |
| 5 | ## DP: Instead, include -laprutil-1 in the compile line. |
| 6 | ## DP: |
| 7 | ## DP: I don't think this can be sent upstream, as it won't work when |
| 8 | ## DP: compiling aprutil in-tree. But I'm not certain. |
| 9 | |
| 10 | @DPATCH@ |
| 11 | Index: build/ac-macros/berkeley-db.m4 |
| 12 | --- a/build/ac-macros/berkeley-db.m4 |
| 13 | +++ b/build/ac-macros/berkeley-db.m4 |
| 14 | @@ -174,7 +174,7 @@ |
| 15 | svn_apu_bdb_lib=["`$apu_config --libs | sed -e 's/.*\(-ldb[^ ]*\).*/\1/'`"] |
| 16 | |
| 17 | CPPFLAGS="$SVN_APRUTIL_INCLUDES $CPPFLAGS" |
| 18 | - LIBS="`$apu_config --ldflags` $svn_apu_bdb_lib $LIBS" |
| 19 | + LIBS="`$apu_config --ldflags --link-ld` $svn_apu_bdb_lib $LIBS" |
| 20 | |
| 21 | AC_TRY_RUN( |
| 22 | [ |
| Name | Value |
|---|---|
| svn:executable | * |
| ViewVC Help | |
| Powered by ViewVC 1.1.5 |