[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac

[Michael Stahl]

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

New commits:
commit 21c682d54aa4368d9c9566f3875a425926d6ec0b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 9 21:42:19 2014 +0100

    configure: ENABLE_NPAPI_FROM_BROWSER requires Xt library
    
    Change-Id: I023927897787ae046baf2751d0e56bfca3fb688f
    (cherry picked from commit 1366a41c320a9bb173dc5e066ab532d679d89bcc)
    Reviewed-on: https://gerrit.libreoffice.org/7346
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index 41b1cba..9887963 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9190,6 +9190,10 @@ if test "$WANT_X11" = "yes"; then
     AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt headers not found])],
      [#include <X11/Intrinsic.h>])
 
+    # ENABLE_NPAPI_FROM_BROWSER requires Xt library
+    AC_CHECK_LIB([Xt], [XtToolkitInitialize], [:],
+        [AC_MSG_ERROR(Xt library not found)])
+
     dnl ===================================================================
     dnl Check for extension headers
     dnl ===================================================================