diff options
| author | Rene Engelhard <rene@debian.org> | 2013-02-13 20:21:44 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-14 08:32:39 +0000 |
| commit | 3a2d996b374be25af3cf8d33ed553c33b39cb96f (patch) | |
| tree | 3179998fbae7704c28e50333e6feb0739713908a /configure.ac | |
| parent | 97751d8ae088763e7d997bdc1de9c89b3ee6c36b (diff) | |
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@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index bb3f96ceed88..ce852295e984 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 |