tkr32: #i105917# merge

curl/curl-7.19.7.patch

@@ -42,25 +42,6 @@
    fi
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
---- misc/curl-7.19.7/lib/Makefile.vc9	2009-11-04 13:35:39.000000000 +0100
-+++ misc/build/curl-7.19.7/lib/Makefile.vc9	2009-11-18 12:32:57.234375000 +0100
-@@ -46,13 +46,13 @@
- # Stem for static libs and DLLs
- #
- LIB_NAME       = libcurl
--LIB_NAME_DEBUG = libcurld
-+LIB_NAME_DEBUG = libcurl
- 
- #
- # Stem for DLL import libs
- #
--IMPLIB_NAME       = libcurl_imp
--IMPLIB_NAME_DEBUG = libcurld_imp
-+IMPLIB_NAME       = libcurl
-+IMPLIB_NAME_DEBUG = libcurl
- 
- !IFNDEF OPENSSL_PATH
- OPENSSL_PATH   = ../../openssl-0.9.8g
 --- misc/curl-7.19.7/lib/setup.h	2009-10-28 21:21:58.000000000 +0100
 +++ misc/build/curl-7.19.7/lib/setup.h	2009-11-18 13:30:42.375000000 +0100
 @@ -193,6 +193,7 @@

curl/makefile.mk

@@ -47,6 +47,12 @@ all:
 
 TARFILE_NAME=curl-7.19.7
 PATCH_FILES=curl-7.19.7.patch
+
+.IF "$(GUI)"=="WNT"
+    PATCH_FILES+=curl-7.19.7_win.patch
+.ENDIF
+
+
 #CONVERTFILES= \
     lib$/Makefile.vc6