[Libreoffice-commits] .: Branch 'libreoffice-3-5' - python/makefile.mk

[Petr Mladek]

 python/makefile.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 35f7233f498785904f37968ee2dedfc59a64e992
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Tue Apr 10 16:07:47 2012 +0100

    to find the headers and (static) library of our internal openssl
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/python/makefile.mk b/python/makefile.mk
index 4f50ed3..1af56e5 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -65,6 +65,13 @@ 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)"!=""
 CC+:=-I$(SYSBASE)$/usr$/include