diff options
| author | Tomas Chvatal <tchvatal@suse.cz> | 2011-11-02 17:36:27 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-11-02 17:37:53 +0100 |
| commit | f6f5c89259867b5aeb86d5509f826da949d122c4 (patch) | |
| tree | 89fd68e2d15904c775be50d163b9826ba7aee345 /libxmlsec | |
| parent | b5ec39a65e8b5d78f9f58bc179e9130c81ec347a (diff) | |
Rename --enable-nss-module to --with-system-nss + introduce --enable-xmlsec.
This also finishes the uncoupling of NSS from the --with-system-mozilla.
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 3ef990f16213..5388580fd960 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -35,9 +35,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE .INCLUDE : settings.mk -.IF "$(ENABLE_NSS_MODULE)" == "NO" && "$(SYSTEM_MOZILLA)" != "YES" +.IF "$(ENABLE_XMLSEC)" == "NO" @all: - @echo "NSS module disabled => no libxmlsec...." + @echo "XMLSec module disabled" .ENDIF # --- Files -------------------------------------------------------- @@ -100,7 +100,7 @@ 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" -.IF "$(SYSTEM_MOZILLA)" != "YES" +.IF "$(SYSTEM_NSS)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no .ENDIF BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) @@ -160,7 +160,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) |