From 658f92a993a3c831f73cbc0a79dfc1ce7dd0dc7f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vz-swig@zeitlins.org>
Date: Mon, 27 Jul 2015 17:17:16 +0200
Subject: [PATCH] Use correct separator in Java class path under Windows.

A semicolon must be used there and not a colon as under Unix.
---
 Examples/test-suite/java/Makefile.in |  3 ++-
 configure.ac                         | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in
index 3b2e1e0d9..6dcc62f26 100644
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@@ -6,6 +6,7 @@ LANGUAGE     = java
 JAVA         = @JAVA@
 JAVAC        = @JAVAC@
 JAVAFLAGS    = -Xcheck:jni
+JAVA_CLASSPATH_SEP := @JAVA_CLASSPATH_SEP@
 SCRIPTSUFFIX = _runme.java
 
 srcdir       = @srcdir@
@@ -96,7 +97,7 @@ setup = \
 # Doxygen test cases need to be compiled together with the CommentsParser class
 # which depends on com.sun.javadoc package which is located in this JAR.
 JAVA_CLASSPATH := .
-$(DOXYGEN_TEST_CASES:=.cpptest): JAVA_CLASSPATH := "$(JAVA_HOME)/lib/tools.jar":.
+$(DOXYGEN_TEST_CASES:=.cpptest): JAVA_CLASSPATH := "$(JAVA_HOME)/lib/tools.jar$(JAVA_CLASSPATH_SEP)."
 $(DOXYGEN_TEST_CASES:=.cpptest): DOXYGEN_COMMENT_PARSER := $(srcdir)/CommentParser.java
 
 # Compiles java files then runs the testcase. A testcase is only run if
diff --git a/configure.ac b/configure.ac
index 8326cf514..3c4d192dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1200,12 +1200,22 @@ case $host in
     if test -n "$JAVA_HOME"; then
       JAVA_HOME=`cygpath --mixed "$JAVA_HOME"`
     fi
+    dnl Java uses semicolons and not colons as separators in its classes search path under Windows.
+    JAVA_CLASSPATH_SEP=";"
+    ;;
+  *-*-mingw*)
+    JAVA_CLASSPATH_SEP=";"
     ;;
   *-*-darwin*)
     dnl Under OS X JAVA_HOME is not set by default, try to set it to the default value.
     if test -z "$JAVA_HOME"; then
       JAVA_HOME=`/usr/libexec/java_home`
     fi
+    JAVA_CLASSPATH_SEP=":"
+    ;;
+  *)
+    dnl Assume generic Unix.
+    JAVA_CLASSPATH_SEP=":"
     ;;
 esac
 
@@ -1344,6 +1354,7 @@ fi
 AC_SUBST(JAVA)
 AC_SUBST(JAVAC)
 AC_SUBST(JAVAINC)
+AC_SUBST(JAVA_CLASSPATH_SEP)
 AC_SUBST(JAVADYNAMICLINKING)
 AC_SUBST(JAVALIBRARYPREFIX)
 AC_SUBST(JAVASO)