[Libreoffice-commits] .: python/makefile.mk
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Apr 10 08:45:53 PDT 2012
python/makefile.mk | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit e6d4795e52643a8e940f79c1ee6510cc14fdfb38
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 10 16:45:48 2012 +0100
extra love for incompatible expat on macosx
diff --git a/python/makefile.mk b/python/makefile.mk
index e66acb7..5043b28 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -65,10 +65,12 @@ CONFIGURE_DIR=
BUILD_DIR=
MYCWD=$(shell @pwd)/$(INPATH)/misc/build
+.IF "$(SYSTEM_OPENSSL)" != "YES"
#we want to be sure we use our internal openssl if
#that's enabled
CC+:=-I$(SOLARINCDIR)$/external
python_LDFLAGS+=-L$(SOLARLIBDIR)
+.ENDIF
# CLFLAGS get overwritten in Makefile.pre.in
.IF "$(SYSBASE)"!=""
More information about the Libreoffice-commits
mailing list