From dfe787ef5de1b38e61989507b26ee4b92f25b9d5 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 25 Jun 2014 16:57:20 +0200
Subject: libgltf: add patch to find the headers in WORKDIR

Change-Id: I8570511be7c1d6de94ee82e18bad5b00b36d99bb
---
 external/libgltf/ExternalProject_libgltf.mk        |  3 +-
 external/libgltf/UnpackedTarball_libgltf.mk        |  1 +
 external/libgltf/patches/libgltf_configure.patch.1 | 40 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 external/libgltf/patches/libgltf_configure.patch.1

(limited to 'external')

diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index 7ef30c801fa8..9d043cdbb01a 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -54,10 +54,11 @@ else
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
+		&& autoreconf \
 		&& ./configure \
 			--disable-debug \
 			--disable-werror \
-			BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+			BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) -I$(BUILDDIR)/config_$(gb_Side)" \
 			GLEW_CFLAGS="$(if $(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glew)/include)" \
 			GLM_CFLAGS="$(if $(SYSTEM_GLM),$(GLM_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glm))" \
 		&& $(MAKE) \
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index da5e018d1b58..e7be31279fd3 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,libgltf,--binary))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
+	external/libgltf/patches/libgltf_configure.patch.1 \
 	external/libgltf/patches/init_scene_set_handle.patch \
 	external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch \
 	external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch \
diff --git a/external/libgltf/patches/libgltf_configure.patch.1 b/external/libgltf/patches/libgltf_configure.patch.1
new file mode 100644
index 000000000000..7eeb7fd1aa24
--- /dev/null
+++ b/external/libgltf/patches/libgltf_configure.patch.1
@@ -0,0 +1,40 @@
+--- libgltf/configure.ac.orig	2014-06-25 16:47:24.218866607 +0200
++++ libgltf/configure.ac	2014-06-25 16:50:59.600868237 +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])
+ 
-- 
cgit