diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-27 08:10:13 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-27 08:10:13 +0000 |
| commit | be48c3f6d085398ece9ab8a1951e9bc885506caa (patch) | |
| tree | b071fbcfb619def5f357ff1370385c94c2084533 /libxmlsec | |
| parent | 6b5f9915895913b26a8338ddef3dc13e29035e8f (diff) | |
INTEGRATION: CWS mingwport03 (1.9.6); FILE MERGED
2006/10/24 13:14:35 vg 1.9.6.2: #i53572# MinGW port
2006/09/26 10:48:46 vg 1.9.6.1: #i53572# MinGW port
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 9b030a6aa324..47bed53d8a1d 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: vg $ $Date: 2007-03-26 16:02:09 $ +# last change: $Author: vg $ $Date: 2007-03-27 09:10:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -113,6 +113,11 @@ xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN' .IF "$(OS)$(COM)"=="SOLARISC52" xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" + +.IF "$(OS)$(COM)"=="LINUXGCC" +xmlsec_LDFLAGS+=-Wl,-z,noexecstack +.ENDIF + LDFLAGS:=$(xmlsec_LDFLAGS) .EXPORT: LDFLAGS @@ -126,7 +131,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS) .ENDIF CONFIGURE_DIR= #CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure CFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" LDFLAGS="$(xmlsec_LDFLAGS)" -CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure CFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" +CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) # system-mozilla needs pkgconfig to get the information about nss # FIXME: This also will enable pkg-config usage for libxml2. It *seems* |