You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2026/05/25 02:10:03 UTC
svn commit: r1934574 - subversion/trunk

Author: brane
Date: Mon May 25 02:10:03 2026
New Revision: 1934574

Log:
Fix dependencies in the svnbrowse autotools build.

* Makefile.in (COMPILE_OPTIONAL, COMPILE_OPTIONAL_CXX): New.
* build.conf (svnbrowse): Use COMPILE_OPTIONAL for compile-cmd.
   Add apr to the list of libraries.

Found by: dsahlberg

Modified:
   subversion/trunk/Makefile.in
   subversion/trunk/build.conf

Modified: subversion/trunk/Makefile.in
==============================================================================
--- subversion/trunk/Makefile.in	Mon May 25 02:07:36 2026	(r1934573)
+++ subversion/trunk/Makefile.in	Mon May 25 02:10:03 2026	(r1934574)
@@ -218,6 +218,10 @@ LT_COMPILE_CXX_NOWARN = $(LIBTOOL) $(LTC
 # Execute a command that loads libraries from the build dir
 LT_EXECUTE = $(LIBTOOL) $(LTFLAGS) --mode=execute `for f in $(abs_builddir)/subversion/*/*.la; do echo -dlopen $$f; done`
 
+# special compilation for files in optional binary targets
+COMPILE_OPTIONAL = $(LT_COMPILE) -o $@ -c
+COMPILE_OPTIONAL_CXX = $(LT_COMPILE_CXX) -o $@ -c
+
 # special compilation for files destined for mod_dav_svn
 COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CFLAGS) $(CMAINTAINERFLAGS) $(LT_CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c -shared
 COMPILE_SHARED_ONLY_LIB = $(LT_COMPILE) -o $@ -c -shared

Modified: subversion/trunk/build.conf
==============================================================================
--- subversion/trunk/build.conf	Mon May 25 02:07:36 2026	(r1934573)
+++ subversion/trunk/build.conf	Mon May 25 02:10:03 2026	(r1934574)
@@ -227,9 +227,9 @@ description = Subversion Repository Brow
 type = exe
 when = SVN_BUILD_SVNBROWSE
 # 'when' is ignored without 'compile-cmd'
-compile-cmd = $(LT_COMPILE) -o $@ -c
+compile-cmd = $(COMPILE_OPTIONAL)
 path = subversion/svnbrowse
-libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta ncurses
+libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta ncurses apr
 install = tui
 
 # Support for GNOME Keyring