diff options
| author | Christoph Willing <chris.willing@iinet.net.au> | 2017-03-02 22:08:51 +1000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-03-04 07:27:10 +0700 |
| commit | 0c8bcb9058bf77c2583e51e8ef8889c7757b9b28 (patch) | |
| tree | 84d9be1c1024b525a0ad06425b6352cbb1c47b38 /office/LibreOffice/LibreOffice.SlackBuild | |
| parent | 188cacfb75d7c41cd3cbe8c965066d5bb9a668ca (diff) | |
office/LibreOffice: Full local help. New JDK options
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
Diffstat (limited to 'office/LibreOffice/LibreOffice.SlackBuild')
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index b7c6dfd13785e..5683f4355c6d7 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=LibreOffice SRCNAM=libreoffice VERSION=${VERSION:-5.3.0.3} SHORT_VERSION=${VERSION%.*.*} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PACKAGER=${PACKAGER:-"AnonymousCoward"} @@ -89,8 +89,19 @@ vlc="" ; [ "${VLC:-no}" != "no" ] && vlc="--enable-vlc" kde4="--enable-kde4" ; [ "${KDE4:-yes}" != "yes" ] && kde4="--disable-kde4" LOLANGS=${LOLANGS:-"de es fr id it ja nl vi zh-CN"} -# LibreOffice.info REQUIRES jdk -[ -z $JAVA_HOME ] && . /etc/profile.d/jdk.sh +JAVA=${JAVA:-openjdk} +if [ "$JAVA" = "openjdk" ]; then + . /etc/profile.d/openjdk.sh + use_java="--with-java=java" +elif [ "$JAVA" = "openjdk8" ]; then + . /etc/profile.d/openjdk8.sh + use_java="--with-java=java" +elif [ "$JAVA" = "jdk" ]; then + . /etc/profile.d/jdk.sh + use_java="--with-java=java" +elif [ "$JAVA" = "no" ]; then + use_java="--with-java=no" +fi # --with-system-harfbuzz \ ./configure \ @@ -113,13 +124,14 @@ LOLANGS=${LOLANGS:-"de es fr id it ja nl vi zh-CN"} $avahi \ $vlc \ $kde4 \ + $use_java \ --with-x \ --with-tls="nss" \ --without-krb5 \ --without-gssapi \ --without-junit \ --with-ant-home=lib$LIBDIRSUFFIX/apache-ant \ - --with-help=common \ + --with-help \ --with-system-boost \ --with-system-cairo \ --with-system-curl \ |