summaryrefslogtreecommitdiff
path: root/external/libgltf/patches/libgltf_configure.patch
blob: d224ab9b7a8cde2d102f5a52d3ee45283b2b5295 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
diff -ur libgltf.org/configure libgltf/configure
--- libgltf.org/configure	2014-06-25 18:41:32.470228670 +0200
+++ libgltf/configure	2014-06-25 18:42:03.922227337 +0200
@@ -15581,15 +15581,18 @@
 # =========
 # Find boost
 # =========
+save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CFLAGS"
 
 ac_fn_cxx_check_header_mongrel "$LINENO" "boost/property_tree/json_parser.hpp" "ac_cv_header_boost_property_tree_json_parser_hpp" "$ac_includes_default"
 if test "x$ac_cv_header_boost_property_tree_json_parser_hpp" = xyes; then :
-  BOOST_CFLAGS=
+
 else
   as_fn_error $? "boost/property_tree/json_parser.hpp not found. install boost" "$LINENO" 5
 fi
 
 
+CPPFLAGS=$save_CPPFLAGS
 
 
 # =========
@@ -15685,14 +15688,17 @@
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
+ save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $GLEW_CFLAGS"
  ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glew.h" "ac_cv_header_GL_glew_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_glew_h" = xyes; then :
-  GLEW_CFLAGS=
+
 else
   as_fn_error $? "GL/glew.h not found. install glew" "$LINENO" 5
 fi
 
 
+ CPPFLAGS=$save_CPPFLAGS
 
 fi
 
@@ -15707,14 +15713,17 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $GLM_CFLAGS"
 ac_fn_cxx_check_header_mongrel "$LINENO" "glm/glm.hpp" "ac_cv_header_glm_glm_hpp" "$ac_includes_default"
 if test "x$ac_cv_header_glm_glm_hpp" = xyes; then :
-  GLM_CFLAGS=
+
 else
   as_fn_error $? "glm/glm.hpp not found. install glm" "$LINENO" 5
 fi
 
 
+CPPFLAGS=$save_CPPFLAGS
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'