external/libgltf/patches/libgltf_configure.patch | 41 -----------------------
1 file changed, 41 deletions(-)
New commits:
commit 211e07c0e02ebfe9cea4b5d97b614a23f8b2012c
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Wed Jun 25 19:23:24 2014 +0200
libgltf: try again with this configure patch
Touch only the configure but not the configure.ac
Change-Id: Iee93036f2378f29530ffae9be8b4324e8425d2ec
diff --git a/external/libgltf/patches/libgltf_configure.patch
b/external/libgltf/patches/libgltf_configure.patch
index 34dc3f7..d224ab9 100644
--- a/external/libgltf/patches/libgltf_configure.patch
+++ b/external/libgltf/patches/libgltf_configure.patch
@@ -59,44 +59,3 @@ diff -ur libgltf.org/configure libgltf/configure
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-diff -ur libgltf.org/configure.ac libgltf/configure.ac
---- libgltf.org/configure.ac 2014-06-25 18:41:32.470228670 +0200
-+++ libgltf/configure.ac 2014-06-25 18:41:41.186228300 +0200
-@@ -36,16 +36,22 @@
- # =========
- # Find boost
- # =========
--AC_CHECK_HEADER(boost/property_tree/json_parser.hpp, [BOOST_CFLAGS=],
-+save_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS="$CPPFLAGS $BOOST_CFLAGS"
-+AC_CHECK_HEADER(boost/property_tree/json_parser.hpp, [],
- [AC_MSG_ERROR(boost/property_tree/json_parser.hpp not found. install
boost)], [])
-+CPPFLAGS=$save_CPPFLAGS
- AC_SUBST([BOOST_CFLAGS])
-
- # =========
- # Find glew
- # =========
- PKG_CHECK_MODULES(GLEW, [glew >= 1.9.0], [] [
-- AC_CHECK_HEADER(GL/glew.h, [GLEW_CFLAGS=],
-+ save_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS="$CPPFLAGS $GLEW_CFLAGS"
-+ AC_CHECK_HEADER(GL/glew.h, [],
- [AC_MSG_ERROR(GL/glew.h not found. install glew)], [])
-+ CPPFLAGS=$save_CPPFLAGS
- ])
- AC_SUBST([GLEW_CFLAGS])
- AC_SUBST([GLEW_LIBS])
-@@ -54,8 +60,11 @@
- # Find glm
- # =========
- AC_LANG_PUSH([C++])
--AC_CHECK_HEADER([glm/glm.hpp], [GLM_CFLAGS=],
-+save_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS="$CPPFLAGS $GLM_CFLAGS"
-+AC_CHECK_HEADER([glm/glm.hpp], [],
- [AC_MSG_ERROR([glm/glm.hpp not found. install glm])], [])
-+CPPFLAGS=$save_CPPFLAGS
- AC_LANG_POP([C++])
- AC_SUBST([GLM_CFLAGS])
-
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
