[Libreoffice-commits] .: liborcus/makefile.mk

[Libreoffice Gerrit user]

 liborcus/makefile.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f721ae074deef795a32ad28289286b5d2667af0d
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Sep 7 11:15:54 2012 -0400

    Specify boost header directory for internal boost.
    
    Change-Id: I60e8533552161933f48a4dfbe17e5108f77fa2eb

diff --git a/liborcus/makefile.mk b/liborcus/makefile.mk
index fd04605..0f6b72c 100644
--- a/liborcus/makefile.mk
+++ b/liborcus/makefile.mk
@@ -53,7 +53,13 @@ MY_CXXFLAGS = CXXFLAGS=-I$(OUTDIR)/inc/external
 .END
 
 CONFIGURE_DIR=
-CONFIGURE_ACTION=./configure \
+CONFIGURE_ACTION=
+
+.IF "$(SYSTEM_BOOST)" != "YES"
+CONFIGURE_ACTION+=export CPPFLAGS="$(CPPFLAGS) -I$(OUTDIR)/inc/external" &&
+.ENDIF
+
+CONFIGURE_ACTION+=./configure \
 	--with-pic \
 	--enable-static \
 	--disable-shared \