From 7a2d5fdca9fc9da0963e619807f611a7b6e882ac Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 26 Mar 2017 15:06:24 +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
---
 configure.ac                | Bin 464529 -> 465257 bytes
 odk/CustomTarget_check.mk   |   2 +-
 odk/Module_odk.mk           |   6 ++++--
 odk/util/check.pl           |   2 +-
 scp2/InstallModule_sdkoo.mk |   6 ++++++
 scp2/source/sdkoo/sdkoo.scp |   2 ++
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5cc49929eb543f02c8cb4da99366b2ccd24eade6..88af5c2da9f67b396ed265bbe3db3e42401d5c77 100644
GIT binary patch
delta 586
zcmY*WO=uHA6lU^v;_ga<x-<zjC6iQJ!3H7~Jd_-w1!Dw*RP<0vjNO&i)&xmZ6v2Q(
z^iZt?{J?^u^ia`uvr(xYgx(4Y*0WmdMX3k9)PvBAlWiz;;A7sr`F@x;4`#!^8sW-o
zb|&i6g<OLd@>lX^akw@)5kQAvJGZqO7!<61^Ke73ZY3kBm=UZ~YjK2Gn|m8jv;D_~
zd$%UoVf^i4Q54(Qu1#^uU<T5H84)*fsHbNm`s!$TB-gS^Ub9L=)pV3ec;?elnw|)X
zcwWTzScUw#aVu9e$6_Ly6on#~-xI2>^m1IkOCd!16dxjW3ZVLo`EYiO>kvPPdpDeM
z={L2Zew(W}X;UxW-Qs@Sv#ASTK64-5+qAc~pev|MlY*Z%?Z$_XJdE5|(wnaBSYIXs
zOH+!9#5cxqs!l<OKTO5sbH$Ij`{c#VI_<~mE02N76Y^u}4s|vuJCJxmKCIO#0r6cb
z+>CCAI*|2vf>^mIBi-JBLviqbEL1z8sd)TIdOmdM5N4-H!zV|+a?w@{EW9CpP-}kM
z<wD6Si%jZtsy}-~*Upc+6P24aUb5VJ3j?bT?K{w-9~(HDk*b(TikO^wtWT6jtb(p>
dQRvc3$J2Fh7%yjNdo|u52}Od>#~WVL{0|1V!P5W$

delta 223
zcmaF4NoL|&nT9Ql;fn1)lo)}SY5NZ)=Bd5Y|2ML6Pxrmc$T7LTlxw<lH?zd_`dC)p
z>9U)c#isw+z|1?{dLy&(^c53;5?vdaC8l<=@J_$KnwfR_j*ZMR(-pQbvroSd6rU~?
z%p^Gd<_2cv>Cc+k<fn&kViuqNVJRcubpMIWY}30oF>6n66J`^fUeE<(ac*X|h3F04
z%q%tCZY?uElZ*fKz)y^_)7Nfh=9?@QEHM2xRFUNLw0dU#>65lFOHY5>$R^v)x|JD-
OS%8>zJL^`qloSB_K2eMS

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 109a0c924ca..bed36df6198 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_lib) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 1dea6578c88..ee1679b6f84 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 8dfbfcc6ba5..cade5a9a098 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")) {
diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
index 0669195323f..09a89f5c323 100644
--- a/scp2/InstallModule_sdkoo.mk
+++ b/scp2/InstallModule_sdkoo.mk
@@ -17,6 +17,12 @@ $(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
 ))
 endif
 
+ifneq ($(JAVADOC),)
+$(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
+	-DJAVADOC \
+))
+endif
+
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
     scp2/source/sdkoo/sdkoo \
 ))
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index f73e3e8ef59..abfeb880320 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -126,6 +126,7 @@ File gid_File_Package_odk_html
 End
 
 #if defined(ENABLE_JAVA)
+#if defined(JAVADOC)
 File gid_File_Package_odk_javadoc
     TXT_FILE_BODY;
     Dir = FILELIST_SDK_DIR;
@@ -133,6 +134,7 @@ File gid_File_Package_odk_javadoc
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 #endif
+#endif
 
 File gid_File_Package_odk_lib
     TXT_FILE_BODY;
-- 
2.30.2