[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - configure.ac

[Fridrich Štrba]

 configure.ac |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 40dc71314259feaf9743e25761c2d4fd3787d154
Author: Fridrich Štrba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 12 10:32:26 2017 +0200

    Detect libjawt automatically on java9 too
    
    Change-Id: Ie8eb53a915682b7a188b1af4b2d435eb0cc9ff81
    (cherry picked from commit 047b4c14ada038204a1e1280742960db00a5d1f2)
    Reviewed-on: https://gerrit.libreoffice.org/54530
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/configure.ac b/configure.ac
index 8ee626ced9f8..558e31d6d5b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7256,7 +7256,12 @@ then
             my_java_arch=$host_cpu
             ;;
         esac
-        JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
+        # This is where JDK9 puts the library
+        if test -e "$JAVA_HOME/lib/libjawt.so"; then
+            JAWTLIB="-L$JAVA_HOME/lib/ -ljawt"
+        else
+            JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
+        fi
         AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
     fi
     AC_MSG_RESULT([$JAWTLIB])