libcdr/ExternalProject_libcdr.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit d0c3eaf87f8335a70d25e8cd6e91f2c7d4e47302
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Jan 25 14:47:14 2013 +0200
Blind "fix" for when using system ICU
No point in pointing to nonexistent ICU headers in solver if building
against a system ICU.
Change-Id: I5a151f3bfefd1913ad84a33d74af749558926312
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 7bc7377..caf53c6 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -61,8 +61,7 @@ else
$(call gb_ExternalProject_get_state_target,libcdr,build) :
cd $(EXTERNAL_WORKDIR) \
&& export PKG_CONFIG="" \
- && export ICU_LIBS=" " \
- && export ICU_CFLAGS="-I$(OUTDIR)/inc/external" \
+ && $(if $(filter NO,$(SYSTEM_ICU)), export ICU_LIBS=" "
ICU_CFLAGS="-I$(OUTDIR)/inc/external") \
&& ./configure \
--with-pic \
--enable-static \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
