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

[Michael Stahl]

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

New commits:
commit 123a5a7079426d7d4cb6b980b384339d6150a0a8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 9 22:34:45 2014 +0100

    configure: check for ICE and SM libraries too
    
    Change-Id: Id86b09c9f2fe8770da8cc6b13672e2bf37201962
    (cherry picked from commit 415dfd0d89f550268dc66d4e7d447c1975a8aa44)
    Reviewed-on: https://gerrit.libreoffice.org/7349
    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 ccf2704..4164d29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9199,6 +9199,14 @@ if test "$WANT_X11" = "yes"; then
     dnl ===================================================================
     AC_CHECK_HEADERS(X11/extensions/shape.h,[],[AC_MSG_ERROR([libXext headers not found])],
      [#include <X11/extensions/shape.h>])
+
+    # vcl needs ICE and SM
+    AC_CHECK_HEADERS(X11/ICE/ICElib.h,[],[AC_MSG_ERROR([libICE headers not found])])
+    AC_CHECK_LIB([ICE], [IceConnectionNumber], [:],
+        [AC_MSG_ERROR(ICE library not found)])
+    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
 
 dnl ===================================================================