From 03f55a313f33850e84fc67b6ef36ccfa57c8fb1d Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 29 Jan 2018 17:52:54 +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 449862 -> 450590 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 4781d02af81..89370213450 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -849,7 +849,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 3d77a66deb0e31560f1dcb721c40dee0d758709b..a6c2947b4ae8662df5feac2bf40dddba6520711f 100644
GIT binary patch
delta 575
zcmY*VO=uHA6lV6#CY!}-bysVe6emlq3SHZxUX(zpg<?D?h#o8<tm(E*EeV<!QK9rw
za<MeB$$oe#E#jpj{-6{Dp%*=QuLmjK>_OVz#G8|CTIj%I-n{R7-}~l$`y5+Xjm>;y
zv*tlv$TKqORGiUbF5?ZnI*MxsI~;CR(ACa5_a4gzJH^wIi-gId*fN;Di}@yt??IO_
zBv>MPtK^Kk7n=iwZ9mGFC+uC-oWXid1fw&(y*n0~c(#QnAG@VYwPG?E%1Xtg57QmO
zc7)aK7M#0NZnijj&k~8GC=}t`Ap`wYMaQ3cI)iMTj$p>4HoW-~(y%?p!&tq~Imz!~
z>4g%<oJZ&Iphj{0@aQ<6EUInz=g~>;oyPqI;;`xz!{m}0$L4R+F;b^aJYAzhsI4)M
z=|wdHvCKJYb?QLsD;>k9It^fBoEtlo^_Qf1H+nAM^>gW?uR;B2f2(MLc&<TRIJ?a>
ztp8Pvpfukg8|pLZrP+w@4N5}H$}HQU@PVs0htosXuOuzG6TJVaMDc5b)bo+%Rv#8h
zZds%UZx2d_9vRCAtCW{JRdR!T9|PS!o$hPVTe_A=il(%6Nt7qtf*#q|p^xRODW7C;
M8R|;P4~2&R1J@t8_5c6?

delta 203
zcmXBMv1-C#00dx?%OAu*Dm9o$`ftTi+Xry4Ls3DL4lec~`T!CfELo(YHvc6{m(Fgb
zf>WlrNPPmK57D*IA3A)u9CvSdSnR{uhw<#ijhdmEyG9M~5nFROJS|aTbZ3|O`-(2V
zR}h>gXwqLJV3Ft;tZ~Vo1Xr9zuox(W?4RLrsBleZV!7PHEO8`-;6}mcQ`K~tE8McO
yL5~l_&Hwg=kenWDhXr-}c|?VNiZ&lp)Hz;=3x1{gUd|!oP6o}=#IBRs=leg|phe&S

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 4ca21d3eaf3..8f5c422ecfa 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -41,11 +41,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