Author: svn-role
Date: Wed Sep 2 04:00:12 2026
New Revision: 1937756
Log:
Merge r1936939 from trunk:
* r1936939
Make sure --with-junit is set when --enable-javahl since the install-
javahl target will fail otherwise since r1933892.
Justification:
We shouldn't fail installing
Votes:
+1: dsahlberg, brane, stsp
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/STATUS
subversion/branches/1.15.x/configure.ac
Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS Wed Sep 2 03:12:11 2026
(r1937755)
+++ subversion/branches/1.15.x/STATUS Wed Sep 2 04:00:12 2026
(r1937756)
@@ -88,11 +88,3 @@ Veto-blocked changes:
Approved changes:
=================
-
-* r1936939
- Make sure --with-junit is set when --enable-javahl since the install-
- javahl target will fail otherwise since r1933892.
- Justification:
- We shouldn't fail installing
- Votes:
- +1: dsahlberg, brane, stsp
Modified: subversion/branches/1.15.x/configure.ac
==============================================================================
--- subversion/branches/1.15.x/configure.ac Wed Sep 2 03:12:11 2026
(r1937755)
+++ subversion/branches/1.15.x/configure.ac Wed Sep 2 04:00:12 2026
(r1937756)
@@ -1724,6 +1724,22 @@ AC_ARG_ENABLE(javahl,
do_javahl_build="yes"
fi
])
+AC_ARG_WITH(junit,
+AS_HELP_STRING([--with-junit=PATH],
+ [Specify a path to the junit JAR file.]),
+[
+ if test "$withval" != "no"; then
+ AC_CHECK_FILE("$withval",, AC_MSG_ERROR([--with-junit='$withval' is not
a file]))
+ if test -n "$JAVA_CLASSPATH"; then
+ JAVA_CLASSPATH="$withval:$JAVA_CLASSPATH"
+ else
+ JAVA_CLASSPATH="$withval"
+ fi
+ JAVAHL_TESTS_TARGET="javahl-tests"
+ JAVAHL_COMPAT_TESTS_TARGET="javahl-compat-tests"
+ have_junit="yes"
+ fi
+])
JAVAHL_OBJDIR=""
INSTALL_EXTRA_JAVAHL_LIB=""
@@ -1732,6 +1748,12 @@ JAVAHL_TESTS_TARGET=""
JAVAHL_COMPAT_TESTS_TARGET=""
LT_CXX_LIBADD=""
if test "$do_javahl_build" = "yes"; then
+ dnl Since r1933892 junit is required to build the JavaHL bindings
+ if test "$have_junit" != "yes"; then
+ AC_MSG_ERROR([--with-junit must be specified if building the Java
high-level
+ bindings.])
+ fi
+
dnl Check for suitable JDK
if test "$JDK_SUITABLE" = "no"; then
AC_MSG_ERROR([Cannot compile JavaHL without a suitable JDK.
@@ -1771,21 +1793,6 @@ AC_SUBST(INSTALL_EXTRA_JAVAHL_LIB)
AC_SUBST(JAVAHL_OBJDIR)
AC_SUBST(FIX_JAVAHL_LIB)
AC_SUBST(LT_CXX_LIBADD)
-
-AC_ARG_WITH(junit,
-AS_HELP_STRING([--with-junit=PATH],
- [Specify a path to the junit JAR file.]),
-[
- if test "$withval" != "no"; then
- if test -n "$JAVA_CLASSPATH"; then
- JAVA_CLASSPATH="$withval:$JAVA_CLASSPATH"
- else
- JAVA_CLASSPATH="$withval"
- fi
- JAVAHL_TESTS_TARGET="javahl-tests"
- JAVAHL_COMPAT_TESTS_TARGET="javahl-compat-tests"
- fi
-])
AC_SUBST(JAVA_CLASSPATH)
AC_SUBST(JAVAHL_TESTS_TARGET)
AC_SUBST(JAVAHL_COMPAT_TESTS_TARGET)
