corrections in the configuration files.

7 files changed, 15 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index d050efab39..aa530785d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 0.3.?
+- Corrections in the configuration files
+
 Version 0.3.0 (17/12/2001)
 - Corrected bug in new integer formatting (now we use the old again)
 - Several corrections and usual cleanups
diff --git a/THANKS b/THANKS
index 261507e449..09fb226cf2 100644
--- a/THANKS
+++ b/THANKS
@@ -5,3 +5,4 @@ Paul Sheer <psheer@icon.co.za>
 Jon Nelson <jnelson@securepipe.com>
 Simon Josefsson <jas@extundo.com>
 Marco d'Itri <md@linux.it>
+Mike Siers <mikes@poliac.com>
diff --git a/configure.in b/configure.in
index a51d9f47ff..d3b0dd6a4e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.50)
 AC_INIT
-dnl AC_CONFIG_HEADER(config.h)
 
 AC_PREFIX_DEFAULT(/usr/local)
 
@@ -246,7 +245,11 @@ LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS -I${includedir}"
 AC_SUBST(LIBGNUTLS_LIBS)
 AC_SUBST(LIBGNUTLS_CFLAGS)
 
-AC_CONFIG_COMMANDS([default],[[
+AC_CONFIG_FILES(lib/gnutls.h.in)
+
+AC_CONFIG_COMMANDS([lib/gnutls.h],[[
+ test -f lib/gnutls.h.in || (echo "Could not generate lib/gnutls.h" && exit 1)
+ cat lib/gnutls.h.in > lib/gnutls.h
  cat lib/gnutls_ui.h >> lib/gnutls.h
  echo "" >> lib/gnutls.h
  cat lib/gnutls_errors_int.h >> lib/gnutls.h
@@ -262,6 +265,7 @@ AC_CONFIG_COMMANDS([default],[[
 ]],[[]])
 
 AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile lib/libgnutls-config \
-lib/gnutls.h doc/Makefile src/x509/Makefile src/srp/Makefile doc/tex/Makefile \
+doc/Makefile src/x509/Makefile src/srp/Makefile doc/tex/Makefile \
 doc/tex/cover.tex doc/scripts/Makefile])
 AC_OUTPUT
+
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0c44f4de2b..8424dc699f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = debug.h gnutls_compress.h defines.h pkcs1.asn pkix.asn \
 	auth_anon.h auth_dhe_dss.h gnutls_extensions.h ext_srp.h \
 	gnutls_auth_int.h crypt_bcrypt.h gnutls_random.h crypt_srpsha1.h \
 	x509_b64.h gnutls_srp.h auth_srp.h auth_srp_passwd.h gnutls_v2_compat.h \
-	crypt.h libgnutls-config.in libgnutls.m4 gnutls.h.in gnutls_errors_int.h \
+	crypt.h libgnutls-config.in libgnutls.m4 gnutls.h.in.in gnutls_errors_int.h \
 	x509_asn1.h x509_der.h gnutls_datum.h auth_x509.h gnutls_gcry.h \
 	gnutls_pk.h gnutls_record.h gnutls_cert.h \
 	gnutls_privkey.h gnutls_constate.h gnutls_global.h x509_verify.h \
diff --git a/lib/gnutls.h.in b/lib/gnutls.h.in.in
index 769d65df39..769d65df39 100644
--- a/lib/gnutls.h.in
+++ b/lib/gnutls.h.in.in
diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 7e9ee5cb16..e383c6e6b3 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -704,7 +704,7 @@ ssize_t _gnutls_handshake_send_int( GNUTLS_STATE state, ContentType type, Handsh
 #ifdef WRITE_DEBUG
 		size_t sum=0, x, j;
 		
-		_gnutls_log( "HWRITE: will write %d bytes to %d.\n", n, fd);
+		_gnutls_log( "HWRITE: will write %d bytes to %d.\n", n, gnutls_transport_get_ptr(state));
 		for (x=0;x<((n)/16)+1;x++) {
 			if (sum>n)
 				break;
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index d97de9e3ac..ab2ff6bae4 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -24,7 +24,7 @@
 
 #include <defines.h>
 
-/*
+
 #define IO_DEBUG 3 // define this to check non blocking behaviour 
 #define BUFFERS_DEBUG
 #define HARD_DEBUG
@@ -33,7 +33,7 @@
 #define HANDSHAKE_DEBUG // Prints some information on handshake 
 #define RECORD_DEBUG
 #define DEBUG
-*/
+
 
 /* It might be a good idea to replace int with void*
  * here.