wrong make install order for dav-lib

Hi,

libsvn_ra needs libsvn_ra_dav. But libsvn_ra_dav is installed after
libsvn_ra and linking of libsvn_ra.so fails.

....
(cd /usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_ra; /bin/sh /usr/src/packages/BUILD/subversion-0.22.0/libtool --mode=relink gcc -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -Wall -g -pthread -DNEON_ZLIB -DNEON_SSL -rpath /usr/lib -o libsvn_ra-1.la ra_loader.lo ../../subversion/libsvn_subr/libsvn_subr-1.la ../../subversion/libsvn_ra_local/libsvn_ra_local-1.la ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la ../../subversion/libsvn_ra_dav/libsvn_ra_dav-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la ../../subversion/libsvn_ra_svn/libsvn_ra_svn-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la /usr/src/packages/BUILD/subversion-0.22.0/apr-util/libaprutil-0.la -lgdbm -ldb-4.0 -lexpat /usr/src/packages/BUILD/subversion-0.22.0/apr/libapr-0.la -lm -lcrypt -lnsl -ldl)
gcc -shared ra_loader.lo -L/usr/X11R6/lib -L/usr/src/packages/BUILD/subversion-0.22.0/apr/.libs -L/usr/lib -L/usr/src/packages/BUILD/subversion-0.22.0/apr-util/.libs -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_subr/.libs -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_delta/.libs -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_fs/.libs -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_repos/.libs -L/var/tmp/subversion-0.22.0-build/usr/lib -lsvn_ra_local-1 -lsvn_repos-1 -lsvn_fs-1 -lsvn_delta-1 -lsvn_ra_dav-1 -lsvn_ra_svn-1 -lsvn_subr-1 -laprutil-0 -lgdbm -ldb-4.0 -lexpat -lapr-0 -lm -lcrypt -lnsl -ldl -Wl,-soname -Wl,libsvn_ra-1.so.0 -o .libs/libsvn_ra-1.so.0.0.0
/usr/lib/gcc-lib/i486-suse-linux/3.3/../../../../i486-suse-linux/bin/ld: cannot find -lsvn_ra_dav-1
collect2: ld returned 1 exit status
libtool: install: error: relink `libsvn_ra-1.la' with the above command before installing it
....
(cd /usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_client; /bin/sh /usr/src/packages/BUILD/subversion-0.22.0/libtool --mode=relink gcc -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -Wall -g -pthread -DNEON_ZLIB -DNEON_SSL -rpath /usr/lib -o libsvn_client-1.la add.lo auth.lo cat.lo checkout.lo cleanup.lo commit.lo commit_util.lo copy.lo delete.lo diff.lo export.lo externals.lo log.lo ls.lo prop_commands.lo providers.lo ra.lo repos_diff.lo resolve.lo revert.lo revisions.lo status.lo switch.lo update.lo url.lo ../../subversion/libsvn_wc/libsvn_wc-1.la ../../subversion/libsvn_ra/libsvn_ra-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_diff/libsvn_diff-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la /usr/src/packages/BUILD/subversion-0.22.0/apr-util/libaprutil-0.la -lgdbm -ldb-4.0 -lexpat /usr/src/packages/BUILD/subversion-0.22.0/apr/libapr-0.la -lm -lcrypt -lnsl -ldl)
gcc -shared add.lo auth.lo cat.lo checkout.lo cleanup.lo commit.lo commit_util.lo copy.lo delete.lo diff.lo export.lo externals.lo log.lo ls.lo prop_commands.lo providers.lo ra.lo repos_diff.lo resolve.lo revert.lo revisions.lo status.lo switch.lo update.lo url.lo -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_ra_svn/.libs -L/usr/X11R6/lib -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_ra_dav/.libs -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_fs/.libs -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_repos/.libs -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_ra_local/.libs -L/usr/src/packages/BUILD/subversion-0.22.0/apr/.libs -L/usr/lib -L/usr/src/packages/BUILD/subversion-0.22.0/apr-util/.libs -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_subr/.libs -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_diff/.libs -L/usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_delta/.libs -L/var/tmp/subversion-0
.22.0-build/usr/lib -lsvn_wc-1 -lsvn_ra-1 -lsvn_delta-1 -lsvn_diff-1 -lsvn_subr-1 -laprutil-0 -lgdbm -ldb-4.0 -lexpat -lapr-0 -lm -lcrypt -lnsl -ldl -Wl,-soname -Wl,libsvn_client-1.so.0 -o .libs/libsvn_client-1.so.0.0.0
/usr/lib/gcc-lib/i486-suse-linux/3.3/../../../../i486-suse-linux/bin/ld: cannot find -lsvn_ra-1
collect2: ld returned 1 exit status
libtool: install: error: relink `libsvn_client-1.la' with the above command before installing it
libtool: install: warning: remember to run `libtool --finish /usr/lib'
....
subversion/svnversion/svnversion . /repos/svn/trunk > /var/tmp/subversion-0.22.0-build/usr/include/subversion-1/svn-revision.txt
gcc: ../../subversion/libsvn_client/.libs/libsvn_client-1.so: No such file or directory
gcc: /usr/src/packages/BUILD/subversion-0.22.0/subversion/libsvn_ra/.libs/libsvn_ra-1.so: No such file or directory
make: *** [revision-install] Error 1
....

This patch tries to fix it.

Index: configure.in
===================================================================
--- configure.in (revision 5777)
+++ configure.in (working copy)
@@ -262,24 +262,25 @@
                     $SVN_FS_WANT_DB_PATCH, [db4 db])
 
 
+# create this one first because ra_dav depends on ra, but ra_dav does also depend on svn_subr
+if test "$svn_lib_neon" = "yes"; then
+ BUILD_RULES_DAVLIB="dav-lib"
+ INSTALL_STATIC_RULES_DAVLIB="install-dav-lib"
+ INSTALL_RULES_DAVLIB="install-dav-lib"
+fi
+
 # Only add *_APACHE_RULE if we also have db, since mod_dav_svn depends on it.
-INSTALL_STATIC_RULES="install-bin install-docs"
-INSTALL_RULES="install-base-lib install-lib install-include install-static"
-BUILD_RULES="base-lib lib bin test"
+INSTALL_STATIC_RULES="install-bin install-docs $INSTALL_STATIC_RULES_DAVLIB"
+INSTALL_RULES="install-base-lib $INSTALL_RULES_DAVLIB install-lib install-include install-static"
+BUILD_RULES="base-lib $BUILD_RULES_DAVLIB lib bin test"
 if test "$svn_lib_berkeley_db" = "yes"; then
- BUILD_RULES="base-lib fs-lib lib bin fs-bin $BUILD_APACHE_RULE test fs-test"
- INSTALL_STATIC_RULES="install-bin install-fs-bin install-docs"
- INSTALL_RULES="install-base-lib install-fs-lib install-lib install-include install-static $INSTALL_APACHE_RULE"
+ BUILD_RULES="base-lib fs-lib $BUILD_RULES_DAVLIB lib bin fs-bin $BUILD_APACHE_RULE test fs-test"
+ INSTALL_STATIC_RULES="install-bin install-fs-bin install-docs $INSTALL_STATIC_RULES_DAVLIB"
+ INSTALL_RULES="install-base-lib install-fs-lib $INSTALL_RULES_DAVLIB install-lib install-include install-static $INSTALL_APACHE_RULE"
   FS_TEST_DEPS="\$(FS_TEST_DEPS)"
   FS_TEST_PROGRAMS="\$(FS_TEST_PROGRAMS)"
 fi
 
-if test "$svn_lib_neon" = "yes"; then
- BUILD_RULES="$BUILD_RULES dav-lib"
- INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-dav-lib"
- INSTALL_RULES="$INSTALL_RULES install-dav-lib"
-fi
-
 AC_SUBST(BUILD_RULES)
 AC_SUBST(INSTALL_STATIC_RULES)
 AC_SUBST(INSTALL_RULES)

-- 
USB is for mice, FireWire is for men!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org