From e4aa56bef921ee3b8f194ee456a0a664a3514c8f Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 31 Oct 2019 17:07:12 +0000
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 466614 -> 467342 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index dc139bd1c17..d400255295b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -869,7 +869,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index 8bee8a65003eda9b0e56db5b1ca3e63e5810de20..bcf23570fae9d3e6b1b40207d60fa1bc6884332d 100644
GIT binary patch
delta 546
zcmdnCSElc<Ov4sN7F9kj1t5sdN-RrE$xn`*EZ8SH{gg7JAUjlK`WyvDDL6+{g;AZw
z3#fMb0u@Hd>3J%QTyVL16-F7joYV9J;*7>{xkt*3YVu&4Vs&&NHkN0WWW+-)v8_xk
zj&1*{!U)7n+rO$XE1VKg&`nfOQc2BAOv*`(&rivo{$Ue~{PYXQm{_OZxx%bD-RA?d
z(DdB*%)HYdJYwXSo{+%CK0Tq8k%bxPjp-L{nPjF{y=OL_9{+|}X8O_h%o5X2ePiOC
z{_H)o>hy$CMwaP5ADKC(3x8l1pML5hP>J0KW|isO+ARE&5Ad=~4|vPMF@3>#X4dJo
zAQcaSSj46;`oL^B^%aXaNRn&1zBY?G#Grx;K!f-{GTTmn@Pdg0WUk`$Kh8k?30qi%
zA=Wf}1Ugvt8PE}Ou|T)(1S$UTkeNf+%Q4K+#oyU8*xd_A*(w3UVY=gMV95UWW??nq
z1Vv40UU6!P0#qRvXIdsW_<&SuPH`%jjiO?@;3sAceN=Om6l@hhMk`q>lw_pladD#P
X;7ZGE*Zsr{#4JF}x?T4ZTc-{HYW2D#

delta 233
zcmeA>EVFH|Ov4sN7S;BpYK%b4w0)@>v*4-eTyL4Vr^|*iaZb-`XXBh+dyQFhy4NRW
zq3P{&8F{B)xW>#nJ@X^8-gK6C%o5W#e*_XX*MYJRKQhZqXZ*x0KfU`pv&i)MmMmP;
z`9Cs?O=o}1$Txk1J`2nA4HiH{8(f)KrZ;?I7N7n>g^6$a+E2`e)BnC>_MC42nb}}^
z`DbRu>D8N9xTkOa43sc8WEGgs@`c%!&&x5)(Z%1{GuYh=NKG#|%qBH`_ZMdA>3+Se
c?9&fO0Cj*I-mdqR8Hibcn033}SGEKl0C8ef!T<mO

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0b63489f05..2d9d5ee6dcb 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 410f8cf8ef1..363a8a41dea 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 03b58fe3da7..63e332079bc 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2