mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgltf: try again with this configure patch

Browse Source 
Touch only the configure but not the configure.ac

Change-Id: Iee93036f2378f29530ffae9be8b4324e8425d2ec
This commit is contained in:
Zolnai Tamás 2014-06-25 19:23:24 +02:00
parent c5bb272883
commit 211e07c0e0
1 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
external/libgltf/patches/libgltf_configure.patch vendored
View File

@ -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])