From 4a4dfeee6fa48ad6b13dc2b2ed10b97ca5609d31 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Wed, 26 Aug 2020 00:49:58 +0300 Subject: [PATCH] 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 Reviewed-by: Mike Kaganski --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) 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