diff options
| author | David Tardon <dtardon@redhat.com> | 2014-05-25 13:19:31 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-05-25 21:00:08 +0200 |
| commit | 0b7d0a82b20c495d4f031ba45ddec01ee01c2a76 (patch) | |
| tree | d59512690baf41dc5f33b290ba2b076bca33ce3a | |
| parent | 7c9c779cfb80a44e22aebf8cb1f22a26b282898d (diff) | |
always provide REDLAND_CFLAGS/LIBS to ext. projects
Change-Id: Iad1004503e91fbaf6251edc50b20d89ddbb15efa
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 920436aaf9cb..2ecd40494ddf 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1784,7 +1784,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ define gb_LinkTarget__use_revenge $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,librevenge)/inc \ + $(REVENGE_CFLAGS) \ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_libraries,$(1),\ @@ -1808,11 +1808,11 @@ define gb_LinkTarget__use_revenge $(call gb_LinkTarget_use_package,$(1),librevenge) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,librevenge)/inc \ + $(REVENGE_CFLAGS) \ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,librevenge)/src/lib/.libs -lrevenge-0.0 \ + $(REVENGE_LIBS) \ ) endef diff --git a/configure.ac b/configure.ac index ad27916b926a..5adefd8f69bd 100644 --- a/configure.ac +++ b/configure.ac @@ -7665,7 +7665,11 @@ AC_SUBST([ENABLE_EOT]) dnl =================================================================== dnl Check for system librevenge dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0]) +AS_IF([test "$COM" = "MSC"], + [librevenge_libdir="${WORKDIR}/LinkTarget/Library"], + [librevenge_libdir="${WORKDIR}/UnpackedTarball/lirevenge/src/lib/.libs"] +) +libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} -lrevenge-0.0"]), dnl =================================================================== dnl Check for system libe-book |