aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2006-02-07 10:26:20 +0000
committerJörg Mayer <jmayer@loplof.de>2006-02-07 10:26:20 +0000
commit83068a9b9d80617a3c478a512eaed169140a1734 (patch)
tree7f32c1c588df22a5e2cf4519f49b504be95c4b80 /config.nmake
parentc24e4dd59752042d0b751b4b188d3e829e067453 (diff)
Paolo Abeni:
>There is still an issue into the HAVE_LIBGNUTLS macro definition. I'm >fixing it and cleaning a bit the windows side configuration. I hope to >post soon the fix. The attached patch should fix the issue. I missed to modify the config.win32 file and I misstyped a few macros name. svn path=/trunk/; revision=17200
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake
index 2ba6f91d74..018ee4c75e 100644
--- a/config.nmake
+++ b/config.nmake
@@ -419,9 +419,9 @@ LIBETHEREAL_CONFIG=
!IFDEF GNUTLS_DIR
GNUTLS_PATH=$(GNUTLS_DIR)
GNUTLS_CFLAGS=/I$(GNUTLS_DIR)
-GNUTLS_LIBS=$(GNUTLS_DIR)\gnutls.lib
+GNUTLS_LIBS=$(GNUTLS_DIR)\gnutls.lib user32.lib
# Nmake uses carets to escape special characters
-GNUTLS_CONFIG=^#define HAVE_GNUTLS 1
+GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1
!else
GNUTLS_CFLAGS=
GNUTLS_LIBS=