diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 15:58:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 15:58:06 +0000 |
| commit | 95bf6da0ac16a439bc2e35e77a6fec54add993ef (patch) | |
| tree | 3d91a80496d7f1f2ba0f6b18ebf8b3a2a4468384 /libxmlsec | |
| parent | 5ca13f7c0dada43109f8bb3f799a74e2abb66da8 (diff) | |
INTEGRATION: CWS sb37 (1.5.8); FILE MERGED
2005/09/12 18:09:56 hjs 1.5.8.2: RESYNC: (1.5-1.6); FILE MERGED
2005/09/12 14:30:59 hjs 1.5.8.1: #125477# add flags to prefer SYSBASE
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index d5e37b0f6aee..d1757afff379 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: rt $ $Date: 2005-09-07 19:37:59 $ +# last change: $Author: hr $ $Date: 2005-12-28 16:58:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -83,16 +83,35 @@ BUILD_ACTION=nmake BUILD_DIR=$(CONFIGURE_DIR) .ELSE .IF "$(GUI)"=="UNX" + +.IF "$(SYSBASE)"!="" +xmlsec_CFLAGS+=-I$(SYSBASE)$/usr$/include +.IF "$(COMNAME)"=="sunpro5" +xmlsec_CFLAGS+=$(C_RESTRICTIONFLAGS) +.ENDIF # "$(COMNAME)"=="sunpro5" +xmlsec_LDFLAGS+=-L$(SYSBASE)$/usr$/lib +.ENDIF # "$(SYSBASE)"!="" + .IF "$(OS)$(COM)"=="LINUXGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' +xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN' .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" -LDFLAGS:=-Wl,-R'$$$$ORIGIN' +xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +LDFLAGS:=$(xmlsec_LDFLAGS) .EXPORT: LDFLAGS + +#.IF "$(OS)$(COM)"=="LINUXGCC" +#LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' +#.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +#.IF "$(OS)$(COM)"=="SOLARISC52" +#LDFLAGS:=-Wl,-R'$$$$ORIGIN' +#.ENDIF # "$(OS)$(COM)"=="SOLARISC52" +#.EXPORT: LDFLAGS .ENDIF CONFIGURE_DIR= -CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure +#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_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* |