From af16c4d1a3a79d51ba1c1ea661d958eed65c15a3 Mon Sep 17 00:00:00 2001
From: Bryan Ischo <bryan@ischo.com>
Date: Thu, 21 Aug 2008 05:00:26 +0000
Subject: * Revert GnuTLS back to openssl, since GnuTLS is too hard to get
 working on   Windows

---
 GNUmakefile.mingw | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'GNUmakefile.mingw')

diff --git a/GNUmakefile.mingw b/GNUmakefile.mingw
index ffe2d16..464bdfd 100644
--- a/GNUmakefile.mingw
+++ b/GNUmakefile.mingw
@@ -76,16 +76,12 @@ ifndef LIBXML2_CFLAGS
     LIBXML2_CFLAGS := -Ic:\libs3-libs\include
 endif
 
-ifndef GCRYPT_CFLAGS
-    GCRYPT_CFLAGS := -Ic:\libs3-libs\include
+ifndef OPENSSL_LIBS
+    OPENSSL_LIBS := -Lc:\openssl -lssl32 -leay32
 endif
 
-ifndef GCRYPT_LIBS
-    GCRYPT_LIBS := -Lc:\libs3-libs\bin -lgcrypt-11
-endif
-
-ifndef GNUTLS_LIBS
-    GNUTLS_LIBS := -Lc:\libs3-libs\bin -lgnutls-26
+ifndef OPENSSL_CFLAGS
+    OPENSSL_CFLAGS := -Ic:\openssl\include
 endif
 
 
@@ -99,12 +95,13 @@ ifndef CFLAGS
 endif
 
 CFLAGS += -Wall -Werror -std=c99 -Iinc $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \
+          $(OPENSSL_CFLAGS) \
           -DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \
           -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \
 	  -Dsleep=Sleep -DFOPEN_EXTRA_FLAGS=\"b\" \
 	  -Iinc/mingw -include windows.h
 
-LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) $(GCRYPT_LIBS) $(GNUTLS_LIBS)
+LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS)
 
 # --------------------------------------------------------------------------
 # Default targets are everything
-- 
cgit v1.2.1