Subject: use Debian packaged versions of jna.jar and vecmath.jar
 instead of those removed from the upstream tarball
Author: Jan Dittberner <jandd@debian.org>
--- a/AI/Interfaces/Java/CMakeLists.txt
+++ b/AI/Interfaces/Java/CMakeLists.txt
@@ -194,8 +194,8 @@
 			set(myJavaBuildDir  "${myBuildDir}/classes")
 
 			# Create our full Java class-path
-			CreateClasspath(myJavaLibs ${myJLibDir})
-			ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}")
+			#CreateClasspath(myJavaLibs ${myJLibDir})
+			ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "/usr/share/java/jna.jar" "/usr/share/java/vecmath.jar")
 
 			# Create a list of all the AIs source files
 			file(GLOB_RECURSE mySources RELATIVE "${mySourceDir}" FOLLOW_SYMLINKS "${mySourceDir}/*.java")
@@ -215,7 +215,7 @@
 				DEPENDS ${Java_AIINTERFACE_TARGET}
 				COMMAND "${JAVA_COMPILE}"
 					"${JAVA_COMPILE_FLAG_CONDITIONAL}"
-					"-cp" "${myClassPath}"
+					"-classpath" "${myClassPath}"
 					"-d" "${myJavaBuildDir}"
 					${mySources}
 				COMMAND "${JAVA_ARCHIVE}"
@@ -349,9 +349,9 @@
 	set(mySrcJarFile               "${myJarFile}-src.jar")
 	set(myJavaGeneratedSourceDir   "${myBuildDir}/src-generated/main/java")
 	set(myJLibDir                  "${myDir}/data/jlib")
-	#set(myJavaLibs                 "${myJLibDir}/jna/jna.jar${PATH_DELIM_H}${myJLibDir}/vecmath.jar")
-	CreateClasspath(myJavaLibs ${myJLibDir})
-	set(myClassPath                ".${PATH_DELIM_H}${myJavaLibs}${PATH_DELIM_H}${myJavaSourceDir}")
+	set(myDebianJavaLibs           "/usr/share/java/jna.jar${PATH_DELIM_H}/usr/share/java/vecmath.jar")
+	#CreateClasspath(myJavaLibs ${myJLibDir})
+	set(myClassPath                ".${PATH_DELIM_H}${myDebianJavaLibs}${PATH_DELIM_H}${myJavaSourceDir}")
 
 	# Used by Java Skirmish AIs
 	SetGlobal(SOURCE_ROOT_${myName}_AIINTERFACE "${myDir}")
@@ -437,7 +437,7 @@
 		DEPENDS "${myJavaGeneratedSourceDir}/${myPkg}/oo/*.java"
 		COMMAND "${JAVA_COMPILE}" ARGS
 		"${JAVA_COMPILE_FLAG_CONDITIONAL}"
-		"-cp" "${myClassPath}"
+		"-classpath" "${myClassPath}"
 		"-d" "${myJavaBuildDir}"
 		${JAVA_GENERATED_SOURCES}
 		WORKING_DIRECTORY "${myJavaGeneratedSourceDir}"
--- a/AI/Skirmish/HughAI/CMakeLists.txt
+++ b/AI/Skirmish/HughAI/CMakeLists.txt
@@ -41,13 +41,13 @@
 		set(myAiBinJarFile       "${myAiJarFile}.jar")
 		set(myLoaderSrcJarFile   "${myLoaderJarFile}-src.jar")
 		set(myAiSrcJarFile       "${myAiJarFile}-src.jar")
-		set(myJLibDir            "${myDir}/data/jlib")
+		#set(myJLibDir            "${myDir}/data/jlib")
 
 		SkirmishAIMessage(STATUS "Found Skirmish AI: ${myName} ${myVersion}")
 
 		# Create our full Java class-path
-		CreateClasspath(myJavaLibs ${myJLibDir})
-		ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}" ${myAiSourceDir} ${myLoaderSourceDir})
+		#CreateClasspath(myJavaLibs ${myJLibDir})
+		ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" ${myAiSourceDir} ${myLoaderSourceDir} "/usr/share/java/jna.jar" "/usr/share/java/vecmath.jar")
 
 		# Create a list of all the AIs source files
 		file(GLOB_RECURSE myLoaderSources RELATIVE "${myLoaderSourceDir}" FOLLOW_SYMLINKS "${myLoaderSourceDir}/*.java")
@@ -60,7 +60,7 @@
 			DEPENDS ${Java_AIINTERFACE_TARGET}
 			COMMAND "${JAVA_COMPILE}"
 				"${JAVA_COMPILE_FLAG_CONDITIONAL}"
-				"-cp" "${myClassPath}"
+				"-classpath" "${myClassPath}"
 				"-d" "${myJavaLoaderBuildDir}"
 				${myLoaderSources}
 			COMMAND "${JAVA_ARCHIVE}"
@@ -76,7 +76,7 @@
 			DEPENDS ${Java_AIINTERFACE_TARGET}
 			COMMAND "${JAVA_COMPILE}"
 				"${JAVA_COMPILE_FLAG_CONDITIONAL}"
-				"-cp" "${myClassPath}"
+				"-classpath" "${myClassPath}"
 				"-d" "${myJavaAiBuildDir}"
 				${myAiSources}
 			COMMAND "${JAVA_ARCHIVE}"