[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - config_host.mk.in configure.ac odk/pack

[Rene Engelhard]

 config_host.mk.in            |    1 +
 configure.ac                 |    5 +++++
 odk/pack/gendocu/makefile.mk |    5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 3a2d996b374be25af3cf8d33ed553c33b39cb96f
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Feb 13 20:21:44 2013 +0100

    don't use -notimestanp when using gjdoc as javadoc
    
    Conflicts:
    	config_host.mk.in
    
    Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187
    Reviewed-on: https://gerrit.libreoffice.org/2142
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/config_host.mk.in b/config_host.mk.in
index 7b9834d..73aecf8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -263,6 +263,7 @@ export JAVACISGCJ=@JAVACISGCJ@
 export JAVACISKAFFE=@JAVACISKAFFE@
 export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
+export JAVADOCISGJDOC=@JAVADOCISGJDOC@
 @x_JAVALIB@ export JAVALIB=@JAVALIB@
 export JAVA_HOME=@JAVA_HOME@
 export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
diff --git a/configure.ac b/configure.ac
index bb3f96c..ce85229 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6021,7 +6021,12 @@ if test "$SOLAR_JAVA" != ""; then
         JAVADOC=`cygpath -d "$JAVADOC"`
         JAVADOC=`cygpath -u "$JAVADOC"`
     fi
+
+    if test `$JAVADOC --version 2>&1 | $GREP -c "gjdoc"` -gt 0; then
+	JAVADOCISGJDOC="yes"
+    fi
 fi
+AC_SUBST(JAVADOCISGJDOC)
 
 if test "$SOLAR_JAVA" != ""; then
     # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 0e51d1c..f3e5b08 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -59,7 +59,10 @@ JAVA_BEAN_SRC_FILES=\
         $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
         $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
 
-JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES)
+JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES)
+.IF "$(JAVADOCISGJDOC)" != "yes"
+JAVADOCPARAMS+= -notimestamp
+.ENDIF
 
 JAVADOCLOG = $(MISC)$/javadoc_log.txt