From d21ed2a7d5d9350c6878cf8ebd94fce023e58bbc Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Fri, 24 Aug 2018 17:57:08 +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 458688 -> 459416 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 9fbb2ce7169..3acad9d8083 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 a00afa94d559f8c0a63d506e56fa4ea519c70d0f..d553d9ed2c12c1f0f85a22a05c3b98e975f74251 100644
GIT binary patch
delta 573
zcmY+BL1+_E5Qcf3-A%HX4Yk^8cd;)i+Cp1s(VL{Swj#zu15&A!*rsONM$0ak*eH4k
z1*r!SG_b$NB1n&ln>C(_ir~RZ^;B;?co8q+O)qg0L!b|aH}m-B|A%?+>gKZtR=Fxx
zEJK%k=5J)zvpM&ArZV>MC`L@t8EU<t-XnV3#UoP;C@E&~))f5%Ek@?@h3wLrU63ob
zW8caa^R6S^WjQl_Nj71!#5p{l5^*mk4!6b5o8nYo(>^mi{C|v6zPP&3Qcd2q3z^M1
zOK^15<}3<%h~3k)PTOgiEx5Ux2^mjH$Au`-5lBZ-u(+hD7<od+kp4?iJoTx&5*mu)
z*EbQy__!8oyMI|17CyeF(+HPU1GSfAAm(#p?}mtC)Tfh`S78OSKJ`Jr!|Z*J36BNw
zxk52ayig8d@u#ZdlTSU^jVj%E4ASu1ry=Zpr>+KKp#FpUv0q~Q-Le|S)hZ>CcDVGa
z6o>JLv-EyP7d}*J3~#o1fD;@1Mgem>JDg1fbR65Wg7v-%^-QGkU$>otU6iTGE0fbR
zQ+i}M-&`MG_FBPi<_8GO2Q)a^!Y^LFkm9a{Ov(hWIB`}MS8Yd+9O%$l3-7OKgPU6c
NaVQ*WZ7a}Z>K{lgy50Z)

delta 222
zcmbQyDs$k!bi)?LbeVPzIYuC6+Rh=z{A23$z75RW)6d(paZJCri;Zjgxk=0t(|xuu
z8%$rfh1qy|#|$9%?-n2-xs_RO`i70nEYtnBGD}bYCCDT)U7?YMYx;z(%u>^(Z!vOB
zfAEfpXZq2t%res*o-y%F*PqGEHvR8bX6@-OuCWPD=Luz0p4Q69F}-FRvn|A=quZEe
zr+?VQ%s-uRJG1U|w+=>u>3-XRvXi$nOHOxlVCA3Ax&vt0-#Qld=^xfHi%pkJWaVgY
S*uf0MEI`b<y<rENgckrOj8dfl

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