[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/libetonyek RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk                             |    2 +-
 config_host.mk.in                                 |    1 +
 configure.ac                                      |    2 ++
 external/libetonyek/ExternalProject_libetonyek.mk |    1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1349491d48a2f8a130f1b8b840383d31e7927252
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 19 16:59:26 2015 +0200

    move setting of GLM_CFLAGS to configure
    
    Change-Id: Ic9f6165626a8ffc303260c0439010fe7e2ce634b

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e44b08a..a114e13 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -157,7 +157,7 @@ else
 define gb_LinkTarget__use_glm_headers
 $(call gb_LinkTarget_use_unpacked,$(1),glm)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,glm) \
+	$(GLM_CFLAGS) \
 	$$(INCLUDE) \
 )
 
diff --git a/config_host.mk.in b/config_host.mk.in
index 27422d3..ffb2deb 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -207,6 +207,7 @@ export GIT_LINK_SRC=@GIT_LINK_SRC@
 export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
 export GLEW_CFLAGS=$(gb_SPACE)@GLEW_CFLAGS@
 export GLEW_LIBS=$(gb_SPACE)@GLEW_LIBS@
+export GLM_CFLAGS=$(gb_SPACE)@GLM_CFLAGS@
 export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@
 export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@
 export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 738d195..e016794 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8633,7 +8633,9 @@ else
     AC_MSG_RESULT([internal])
     BUILD_TYPE="$BUILD_TYPE GLM"
     SYSTEM_GLM=
+    GLM_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/glm"
 fi
+AC_SUBST([GLM_CFLAGS])
 AC_SUBST([SYSTEM_GLM])
 
 dnl ===================================================================
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index 31ec898..3de8605 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -39,7 +39,6 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 			BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			XML_CFLAGS="$(LIBXML_CFLAGS)" \
 			XML_LIBS="$(LIBXML_LIBS)" \
-			$(call gb_Helper_optional,GLM,GLM_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,glm)") \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)