diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-03 16:36:38 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-03 16:36:38 +0000 |
| commit | dea4367cce25ef97240acf35a15aab27cecefafb (patch) | |
| tree | af9d3f26558c14ccad476c4b80704135a37c3f69 /curl | |
| parent | 88f5bc103b2431e29690766f69e046c4c747a2ee (diff) | |
INTEGRATION: CWS macintel01 (1.14.2); FILE MERGED
2006/01/27 21:12:13 ericb 1.14.2.4: #i60958# remove useless UB changes in curl
2006/01/21 21:29:28 ericb 1.14.2.3: #i60958# delete CXXFLAGS because no need to use it in curl
2006/01/21 21:00:35 ericb 1.14.2.2: #i60958# fix typo correct name is UNIVERSAL_CFLAGS
2006/01/21 20:55:47 ericb 1.14.2.1: #i60958# add UNIVERSL_FLAG for curl on Mac OS X Intel
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index 7c8a15c18bd9..5717d2915caf 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: hr $ $Date: 2005-12-28 16:56:36 $ +# last change: $Author: kz $ $Date: 2006-02-03 17:36:38 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -64,7 +64,7 @@ curl_LDFLAGS+=-L$(SYSBASE)$/usr$/lib 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 CFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" +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" |