Some minor fixes in the makefiles. They now include CFLAGS

from libgcrypt or opencdk if installed in a non standard directory.

5 files changed, 8 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index a847dbc03c..0bff296913 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 1.0.1
+- Some minor fixes in the makefiles. They now include CFLAGS
+  from libgcrypt or opencdk if installed in a non standard directory.
+
 Version 1.0.0 (04/12/2003)
 - Exported the static SRP group parameters.
 - Some fixes in the certificate authenticated SRP ciphersuites.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7924cfcdea..c5ff61952f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../libextra -Iminitasn1/ -I../includes
+INCLUDES = -I../libextra -Iminitasn1/ -I../includes $(LIBGCRYPT_CFLAGS)
 bin_SCRIPTS = libgnutls-config
 
 m4datadir = $(datadir)/aclocal
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 65e8971d5a..0a28bb78b2 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../lib -I../includes -I../lib/minitasn1/
+INCLUDES = -I../lib -I../includes -I../lib/minitasn1/ $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS)
 bin_SCRIPTS = libgnutls-extra-config
 SUBDIRS = openpgp
 
diff --git a/libextra/openpgp/Makefile.am b/libextra/openpgp/Makefile.am
index a2b883b0ec..174cd01262 100644
--- a/libextra/openpgp/Makefile.am
+++ b/libextra/openpgp/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../ -I../../includes/ -I../../lib -I../../lib/minitasn1
+INCLUDES = -I../ -I../../includes/ -I../../lib -I../../lib/minitasn1 $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS)
 EXTRA_DIST = openpgp.h gnutls_openpgp.h
 
 noinst_LTLIBRARIES = libpgp.la
diff --git a/src/cli.c b/src/cli.c
index d3042166b6..539251efe9 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -422,7 +422,7 @@ int main(int argc, char **argv)
 		}
 
 		if (FD_ISSET(sd, &rset)) {
-			bzero(buffer, MAX_BUF + 1);
+			memset(buffer, 0, MAX_BUF + 1);
 			ret = socket_recv(hd, buffer, MAX_BUF);
 
 			if (ret == 0) {