From 82feaf87818fe7dc6754ff1d698cea698c8500cf Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 23 Sep 2019 11:39:49 +0100
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 466157 -> 466885 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 d255bd76cf7529814f18049b5310147d8953e0d7..a5dc579243f05389cddbd16df0bc3d9531f61a7d 100644
GIT binary patch
delta 586
zcmY*WO=uHQ5N0!PW3p{RYirV<s4ttf{v}rM=U@q>Sd^xeQVL#bNMo}ht2HTXRJ`R@
z5f9=D-%$^uAk>pkJcxP_Jotm87Y|BM!GmOXd+f#dk|u{fm^Y7^@0;(<OygDL{hLVj
zrQ~Qqg^ROzHFq<YFE3}T==XhA@LO-<mQg7ty3u$W)CMlB>dQvK&`n+`>bwKMpe7w=
zX;A|yO^W$DVV<}8Ux$2iQ!~7q8^#k&I*JD~QWPJ<(%wDY3ZG)q*ul0;CcY!L*!n`Y
zlTY5(&CFU|lZ1IT>Kfhq5ax*-S2ewqyRxEZ%lT_6k0yDkjIF0^5Y-0F!|CxT;7ulj
z&oV}$L2UhE5qxdXDV+Vsf(Y6)hP$pOfciXRXx2!^1)Cz)<6efPZDJ_cG>T&*-Utqy
zVG17EG=kA-76R}0dhzy<U~SqI#_G5n!qO&r(X{C}hR(48^!*ePNtt3u)jU3A)8cae
zQUInyC*gi3-;TyJhxS{~17Td=7NMF$2|T<mnz;X)n02DZhd!5*crn3zn009wf4;~=
zr~R#c+$foPg{LPkO-{|7SNsK|JwoC16;p4&cOg)8>Bx8oKD}@;Em$f~a#f61ooKDJ
fr1*C+l!AeGcjN(7e^6*`-6dg6n7py>dQ<WLuWQD4

delta 237
zcmX@QU*_#jnT9Ql?^W6-s4)UD)Ak8!%(W+`UtnS9p5D8hiDUA*Jg(`TXPG6Yzvp7*
zoj&&iv)J^S_sqQ0cfV&go*w-MD8cmsNZe{=<DI_XDl_YJix12)(-(YVW}hAplE{)~
z5}7XG&B6uJD>eQ1Q%0`o>)lw`r+;|E%s2h^2WH{v2^CEI(^)?<8%+QHk5zE`y)(?(
z(<i(I+A$3z1~%&IN1)!nZ<+b0^L=90ov!wPQDA!XCuUoatmO3PBCPz=g+4P&PyhXn
YSqSX-_SVnLK+FQftlL{ZvpMJh0RFaNv;Y7A

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