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

[David Tardon]

 configure.ac |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 964dd1e47996dd513d94b860649f684b3c3ad1a4
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Feb 2 21:39:28 2014 +0100

    glm does not provide any .pc file
    
    Change-Id: I8c4560e037e772a10a521931a44594a5f7a7f7ed

diff --git a/configure.ac b/configure.ac
index f0e04a8..5ef4025 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8793,7 +8793,20 @@ AC_SUBST([MDDS_CPPFLAGS])
 dnl ===================================================================
 dnl Check for system glm
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([glm], [GLM], [glm >= 0.9.4])
+AC_MSG_CHECKING([which glm to use])
+if test "$with_system_glm" = "yes"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_GLM=YES
+    AC_LANG_PUSH([C++])
+    AC_CHECK_HEADER([glm/glm.hpp], [],
+       [AC_MSG_ERROR([glm/glm.hpp not found. install glm])], [])
+    AC_LANG_POP([C++])
+else
+    AC_MSG_RESULT([internal])
+    BUILD_TYPE="$BUILD_TYPE GLM"
+    SYSTEM_GLM=NO
+fi
+AC_SUBST([SYSTEM_GLM])
 
 dnl ===================================================================
 dnl Check for system glew