[Libreoffice-commits] core.git: configure.ac

[Mike Kaganski (via logerrit)]

 configure.ac |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4a4dfeee6fa48ad6b13dc2b2ed10b97ca5609d31
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Aug 26 00:49:58 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Aug 26 06:26:52 2020 +0200

    Only check X11/Intrinsic.h when $ENABLE_JAVA
    
    See Stephan's comment at
    https://gerrit.libreoffice.org/c/core/+/101341/2/configure.ac@10059:
    
    > that file is only compiled (via bean/Module_bean.mk -> bean/Library_officebean.mk)
    > when ENABLE_JAVA, so that should arguably be reflected here
    
    Change-Id: I648543cd7b71b88a29fd52483f2d97e53d3c23dc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101374
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/configure.ac b/configure.ac
index cced3f7668de..d60bfaf425a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10055,7 +10055,9 @@ if test "$USING_X11" = TRUE; then
     AC_CHECK_HEADERS(X11/SM/SMlib.h,[],[AC_MSG_ERROR([libSM headers not found])])
     AC_CHECK_LIB([SM], [SmcOpenConnection], [:],
         [AC_MSG_ERROR(SM library not found)])
+fi
 
+if test "$USING_X11" = TRUE -a "$ENABLE_JAVA" != ""; then
     # bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c needs Xt
     AC_CHECK_HEADERS(X11/Intrinsic.h,[],[AC_MSG_ERROR([libXt headers not found])])
 fi