libxmlsec/makefile.mk | 8 ++++---- xmlsecurity/source/xmlsec/nss/makefile.mk | 13 ++++++------- 2 files changed, 10 insertions(+), 11 deletions(-)
New commits: commit 797198822eed356c3a5a6b6cf65c749cd342d564 Author: Herbert Dürr <[email protected]> Date: Mon Nov 11 15:02:13 2013 +0000 #i123639# use standard nss3/nspr4 include paths for system nss in xmlsec diff --git a/xmlsecurity/source/xmlsec/nss/makefile.mk b/xmlsecurity/source/xmlsec/nss/makefile.mk index 6ebf737..b824560 100644 --- a/xmlsecurity/source/xmlsec/nss/makefile.mk +++ b/xmlsecurity/source/xmlsec/nss/makefile.mk @@ -42,14 +42,14 @@ CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) @echo "No nss -> no libxmlsec -> no xmlsecurity/nss" .ENDIF -.IF "$(SYSTEM_MOZILLA)" != "YES" +.IF "$(SYSTEM_NSS)" != "YES" MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla NSS_INC = $(MOZ_INC)$/nss NSPR_INC = $(MOZ_INC)$/nspr .ELSE -# MOZ_INC already defined from environment -NSS_INC = $(MOZ_NSS_CFLAGS) -NSPR_INC = $(MOZ_INC)$/nspr +# TODO: better use pkgconfig to find the proper system include path +NSS_INC = /usr/include/nss3 +NSPR_INC = /usr/include/nspr4 .ENDIF .IF "$(GUI)" == "WNT" @@ -105,9 +105,8 @@ CDEFS += -DXMLSEC_NO_XSLT # --- Files -------------------------------------------------------- SOLARINC += \ - -I$(MOZ_INC) \ --I$(NSPR_INC) \ --I$(PRJ)$/source$/xmlsec + -I$(NSPR_INC) \ + -I$(PRJ)$/source$/xmlsec SOLARINC += -I$(NSS_INC) commit 36211d26ee20c9e46054e965e199f1af81d946ee Author: Herbert Dürr <[email protected]> Date: Mon Nov 11 14:07:26 2013 +0000 #i123639# allow pkgconfig for using the system nss in libxmlsec else libxmlsec may have a hard time to find the system nss headers and libs Found by: Pedro Giffuni <[email protected]> diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index f1960c2..37c280b 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -95,9 +95,9 @@ xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump" -.IF "$(SYSTEM_MOZILLA)" != "YES" +.IF "$(SYSTEM_NSS)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no .ENDIF BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) @@ -148,7 +148,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS) CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" -# system-mozilla needs pkgconfig to get the information about nss +# system-nss needs pkgconfig to get the information about nss # FIXME: This also will enable pkg-config usage for libxml2. It *seems* # that the internal headers still are used when they are there but.... # (and that pkg-config is allowed to fail...) @@ -157,7 +157,7 @@ CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=n # --with-nss or parse -pkg-config --libs / cflags mozilla-nss since # the lib may a) be in /usr/lib (Debian) and be not in $with_nss/include # $with_nss/lib. -.IF "$(SYSTEM_MOZILLA)" != "YES" +.IF "$(SYSTEM_NSS)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no .ENDIF BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
