On Sun, 6 Jan 2002 22:17:15 +0100
Roman Neuhauser <neuhauser@mobil.cz> wrote:
> Hi there,
>
> just tried to build r727 w/ bdb-4.0.14:
> ./configure --enable-maintainer-mode --disable-shared
> just per INSTALL. The build fails with
...
> `/home/roman/install/svn/subversion-r727/db/dist/libdb-4.0.la'
This seems to have been caused by the checking on 2002-01-02.
rev 727 Wed 2 Jan
* ac-helpers/berkeley-db.m4 (SVN_LIB_BERKELEY_DB): Link to the .la
library unconditionally, as Berkeley now generates one. Make
workarounds look for Berkeley 4.0, not 3.3.
Index: berkeley-db.m4
===================================================================
--- berkeley-db.m4
+++ tmp.34808.00001 Mon Jan 7 06:33:55 2002
@@ -97,13 +97,7 @@
dbdir=`cd db/dist ; pwd`
SVN_DB_INCLUDES="-I$dbdir"
svn_lib_berkeley_db=yes
- # Linking directly to the .la is broken with --disable-shared
- # because Berkeley db does not seem to generate a .la library.
- if test "$enable_shared" = "yes"; then
- SVN_DB_LIBS="$dbdir/libdb-3.3.la"
- else
- SVN_DB_LIBS="-L$dbdir -ldb"
- fi
+ SVN_DB_LIBS="$dbdir/libdb-4.0.la"
elif test "$status" = "skip"; then
svn_lib_berkeley_db=no
else
This change was not correct since version 4.X still creates a .a file instead of a .la
file when built with --disable-shared. The following patch fixes the problem.
2002-01-07 Mo DeJong <supermo@bayarea.net>
* ac-helpers/berkeley-db.m4 (SVN_LIB_BERKELEY_DB): Reverse change
make on 2002-01-02 (rev 727) that unconditionally linked to a .la
file in the db subdirectory. When built with --disable-shared,
Berkeley db does not create a .la file. Note that the library
name change for 4.X was not reversed.
Index: ac-helpers/berkeley-db.m4
===================================================================
--- ac-helpers/.svn/text-base/berkeley-db.m4.svn-base Mon Jan 7 05:47:35 2002
+++ ac-helpers/berkeley-db.m4 Mon Jan 7 06:35:03 2002
@@ -97,7 +97,13 @@
dbdir=`cd db/dist ; pwd`
SVN_DB_INCLUDES="-I$dbdir"
svn_lib_berkeley_db=yes
- SVN_DB_LIBS="$dbdir/libdb-4.0.la"
+ # Linking directly to the .la is broken with --disable-shared
+ # because Berkeley db does not seem to generate a .la library.
+ if test "$enable_shared" = "yes"; then
+ SVN_DB_LIBS="$dbdir/libdb-4.0.la"
+ else
+ SVN_DB_LIBS="-L$dbdir -ldb"
+ fi
elif test "$status" = "skip"; then
svn_lib_berkeley_db=no
else
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:55 2006