summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2010-03-10 09:09:23 +0000
committerCaolán McNamara <cmc@openoffice.org>2010-03-10 09:09:23 +0000
commitb1d4997e71b773f87411d2fca27f6e00b6e755ab (patch)
treed4d24f28ac028bdd80e6f6d3afb1432a98e507a0
parent991d51b9ba906e4c969688cc00c3a6480eb23f25 (diff)
parent697dd812b2c17fc2f5c2737e981854dedc41c26d (diff)
xmlsec1_2_14: merge with DEV300 m74
-rw-r--r--external/prj/build.lst2
-rw-r--r--libxmlsec/makefile.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/external/prj/build.lst b/external/prj/build.lst
index 20e0d4127964..8bcc6c10c07e 100644
--- a/external/prj/build.lst
+++ b/external/prj/build.lst
@@ -1,4 +1,4 @@
-el external : SO:external_so soltools NULL
+el external : soltools NULL
el external usr1 - all el_mkout NULL
el external\glibc nmake - all el_glibc NULL
el external\gcc3_specific nmake - all el_gcc3 NULL
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 495427c546ac..86bab96b3093 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -128,6 +128,7 @@ xmlsec_CFLAGS+=$(C_RESTRICTIONFLAGS)
.ENDIF # "$(COMNAME)"=="sunpro5"
.IF "$(EXTRA_CFLAGS)"!=""
xmlsec_CFLAGS+=$(EXTRA_CFLAGS)
+xmlsec_CPPFLAGS+=$(EXTRA_CFLAGS)
.ENDIF # "$(EXTRA_CFLAGS)"!=""
xmlsec_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""