Fix libgltf dbgutil build

The libgltf configure.ac script changes the autotools user variables
CFLAGS and CXXFLAGS, which is not allowed and can overwrite user
settings (which it does for the -D_GLIBCXX_DEBUG flag).

So this moves the special compile settings to seperate variables and
passes them to AM_CXXFLAGS and AM_CPPFLAGS, so the library actually
gets compiled with libstdc++ debug objects.

Change-Id: I00989f5fb629a6aac43ee5a2eb287b0491a3b86d

external/libgltf/ExternalProject_libgltf.mk

@@ -52,16 +52,17 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
 			/p:AdditionalLibraryDirectories=$(if $(SYSTEM_GLEW),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
 	,build/win32)
 
-else
+else # !ifeq($(COM),MSC)
 
-libgltf_CPPFLAGS :=
+libgltf_CPPFLAGS=$(CPPFLAGS)
+ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
 ifneq (,$(gb_ENABLE_DBGUTIL))
-	libgltf_CPPFLAGS += -D_GLIBCXX_DEBUG
+libgltf_CPPFLAGS+=-D_GLIBCXX_DEBUG
+endif
 endif
 
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
 	$(call gb_ExternalProject_run,build,\
-		CPPFLAGS='$(libgltf_CPPFLAGS)' \
 		export PKG_CONFIG="" \
 		&& ./configure \
 			--disable-shared \
@@ -72,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
 			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))" \
+			$(if $(libgltf_CPPFLAGS),CPPFLAGS='$(libgltf_CPPFLAGS)') \
 		&& $(MAKE) \
 	)
 

external/libgltf/UnpackedTarball_libgltf.mk

@@ -17,6 +17,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
 	external/libgltf/patches/missing_include.patch \
+	external/libgltf/patches/fix_configure_flags.patch \
+	external/libgltf/patches/autoreconf_run.patch \
 ))
 
 # vim: set noet sw=4 ts=4:

external/libgltf/patches/fix_configure_flags.patch

+diff -ur libgltf-0.0.0.orig/configure.ac libgltf-0.0.0/configure.ac
+--- libgltf-0.0.0.orig/configure.ac	2014-07-30 20:09:19.000000000 +0200
++++ libgltf-0.0.0/configure.ac	2014-08-06 11:15:24.000000000 +0200
+@@ -90,15 +90,12 @@
+  [enable_werror=yes]
+ )
+ AS_IF([test x"$enable_werror" != "xno"], [
+- CFLAGS="$CFLAGS -Werror"
+- CXXFLAGS="$CXXFLAGS -Werror"
++  LIBGLTF_CXXFLAGS="$LIBGLTF_CXXFLAGS -Werror"
+ ])
+ AS_IF([test x"$GCC" = xyes], [
+ # Be tough with warnings and produce less careless code
+-CFLAGS="$CFLAGS -Wall -pedantic -Wextra -Wshadow"
+-CXXFLAGS="$CXXFLAGS -Wall -pedantic -Wextra -Weffc++ -Wshadow"
++  LIBGLTF_CXXFLAGS="${LIBGLTF_CXXFLAGS} -Wall -pedantic -Wextra -Weffc++ -Wshadow"
+ ])
+-AC_SUBST(DEBUG_CXXFLAGS)
+ 
+ # ============
+ # Debug switch
+@@ -109,13 +106,15 @@
+  [enable_debug=no]
+ )
+ AS_IF([test "x$enable_debug" = "xyes"], [
+- DEBUG_CXXFLAGS="-DDEBUG -g"
++  LIBGLTF_CPPFLAGS="${LIBGLTF_CPPFLAGS} -DDEBUG"
++  LIBGLTF_CXXFLAGS="${LIBGLTF_CXXFLAGS} -g"
++ 
+ ], [
+- DEBUG_CXXFLAGS="-DNDEBUG"
++  LIBGLTF_CPPFLAGS="${LIBGLTF_CXXFLAGS} -DNDEBUG"
+ ])
+-LIBGLTF_CXXFLAGS="$LIBGLTF_CFLAGS"
++
++AC_SUBST(LIBGLTF_CPPFLAGS)
+ AC_SUBST(LIBGLTF_CXXFLAGS)
+-AC_SUBST(DEBUG_CXXFLAGS)
+ 
+ # =====================
+ # Prepare all .in files
+diff -ur libgltf-0.0.0.orig/src/Makefile.am libgltf-0.0.0/src/Makefile.am
+--- libgltf-0.0.0.orig/src/Makefile.am	2014-08-04 20:33:09.000000000 +0200
++++ libgltf-0.0.0/src/Makefile.am	2014-08-06 11:16:39.000000000 +0200
+@@ -7,7 +7,8 @@
+  $(top_srcdir)/inc/libgltf.h \
+  $(top_srcdir)/inc/types.h
+ 
+-AM_CXXFLAGS = -I$(top_srcdir)/inc $(BOOST_CFLAGS) $(GLEW_CFLAGS) $(GLM_CFLAGS) $(DEBUG_CXXFLAGS)
++AM_CXXFLAGS = -I$(top_srcdir)/inc $(BOOST_CFLAGS) $(GLEW_CFLAGS) $(GLM_CFLAGS) $(LIBGLTF_CXXFLAGS)
++AM_CPPFLAGS = $(LIBGLTF_CPPFLAGS)
+ 
+ libgltf_@GLTF_MAJOR_VERSION@_@GLTF_MINOR_VERSION@_la_LIBADD = $(BOOST_LIBS) $(GLEW_LIBS) $(GLM_LIBS)
+ libgltf_@GLTF_MAJOR_VERSION@_@GLTF_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined

external/liborcus/ExternalProject_liborcus.mk

@@ -64,7 +64,7 @@ endif
 # library (glibc), the NDK does offer the GNU C++ library as one of
 # the C++ libraries available, and we use it.
 #
-ifneq (,$(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)))
+ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
 ifneq (,$(gb_ENABLE_DBGUTIL))
 liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif