diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 15:56:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 15:56:36 +0000 |
| commit | 1ac132054bda9118408e233124d78a25beb69ad5 (patch) | |
| tree | 6429e54c731d771219b62ffc39d9a0a28e4d2c3c /curl | |
| parent | a7da2208259ef9047e3c1940e57daea517fd8ddf (diff) | |
INTEGRATION: CWS sb37 (1.12.8); FILE MERGED
2005/09/12 18:09:17 hjs 1.12.8.2: RESYNC: (1.12-1.13); FILE MERGED
2005/09/12 12:40:05 hjs 1.12.8.1: #125477# add flags to prefer SYSBASE
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/makefile.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index 9377676d0aae..7c8a15c18bd9 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # -# last change: $Author: rt $ $Date: 2005-09-08 09:46:10 $ +# last change: $Author: hr $ $Date: 2005-12-28 16:56:36 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -55,10 +55,16 @@ CONVERTFILES= \ lib$/Makefile.vc6 .IF "$(GUI)"=="UNX" + +.IF "$(SYSBASE)"!="" +curl_CFLAGS+=-I$(SYSBASE)$/usr$/include +curl_LDFLAGS+=-L$(SYSBASE)$/usr$/lib +.ENDIF # "$(SYSBASE)"!="" + CONFIGURE_DIR=.$/ #relative to CONFIGURE_DIR CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict +CONFIGURE_FLAGS= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict CFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" BUILD_DIR=$(CONFIGURE_DIR)$/lib .IF "$(OS)"=="IRIX" |