diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 10:39:02 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 10:39:02 +0000 |
| commit | 0f409b98cd85f0db082a078a11a77fad49ddd302 (patch) | |
| tree | 8463283cb105907c4118d9a9f4a661c5fc63efcd /libxmlsec | |
| parent | e3dc70615e56a5a112e1868383506dd3191e50d3 (diff) | |
INTEGRATION: CWS systemmozilla (1.1.1.1.12); FILE MERGED
2005/03/12 17:58:33 rene 1.1.1.1.12.5: add comment...
2005/03/12 14:52:29 rene 1.1.1.1.12.4: #i17187# system-mozilla needs pkgconfig
2005/03/12 00:37:33 rene 1.1.1.1.12.3: RESYNC: (1.1.1.1-1.2); FILE MERGED
2005/03/03 13:40:15 rene 1.1.1.1.12.2: #i17187# reanimate --disable-mozilla
2005/01/06 18:58:34 rene 1.1.1.1.12.1: #i17187# use system mozilla ... (patch)
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 706a15232224..7dbab0917fec 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2005-03-29 11:44:27 $ +# last change: $Author: rt $ $Date: 2005-03-30 11:39:02 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,6 +69,11 @@ TARGET=so_xmlsec1 .INCLUDE : settings.mk +.IF "$(WITH_MOZILLA)" == "NO" +@all: + @echo "Mozilla disabled -> no nss -> no libxmlsec...." +.ENDIF + # --- Files -------------------------------------------------------- XMLSEC1VERSION=1.2.6 @@ -106,7 +111,19 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE CONFIGURE_DIR= CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure -CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --enable-pkgconfig=no +CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no +# system-mozilla 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...) +# I have no real good idea how to get mozilla (nss) pkg-config'ed and libxml2 +# not... We need mozilla-nss pkg-config'ed since we can *not* just use +# --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" +CONFIGURE_FLAGS+=--enable-pkgconfig=no +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) .ENDIF |