*** empty log message ***

7 files changed, 17 insertions, 18 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 33058dcf36..687f6c9ba9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ EXTRA_DIST = common.h prime.gaa crypt.gaa crypt-gaa.h README.srpcrypt prime-gaa.
 		tls_test-gaa.h tests.h gnutls-http-serv list.h
 SUBDIRS = srp x509 openpgp
 
-INCLUDES = -I../lib -I../libtasn1/lib
+INCLUDES = -I../lib -I../libtasn1/lib -I../includes
 
 bin_PROGRAMS = gnutls-serv gnutls-cli gnutls-srpcrypt gnutls-cli-debug
 gnutls_serv_SOURCES = serv-gaa.c serv.c common.c
diff --git a/src/cli.c b/src/cli.c
index 1b56244897..0c62fcd93d 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -27,8 +27,8 @@
 #include <arpa/inet.h>
 #include <string.h>
 #include <unistd.h>
-#include "../lib/gnutls.h"
-#include "../libextra/extra.h"
+#include <gnutls/gnutls.h>
+#include <gnutls/extra.h>
 #include <sys/time.h>
 #include <signal.h>
 #include <netdb.h>
diff --git a/src/common.c b/src/common.c
index 272c6cc105..a2cda7095d 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
-#include "../lib/gnutls.h"
-#include "../libextra/extra.h"
+#include <gnutls/gnutls.h>
+#include <gnutls/extra.h>
 #include <time.h>
 
 #define PRINTX(x,y) if (y[0]!=0) printf(" #   %s %s\n", x, y)
@@ -42,17 +42,17 @@ void print_x509_info(GNUTLS_STATE state)
 	time_t expiret = gnutls_certificate_expiration_time_peers(state);
 	time_t activet = gnutls_certificate_activation_time_peers(state);
 
-/* gnutls_datum xml; */
+// gnutls_datum xml; 
 
 	cert_list = gnutls_certificate_get_peers(state, &cert_list_size);
 
 	if (cert_list_size <= 0)
 		return;
 
-/*
-gnutls_x509_get_certificate_xml( &cert_list[0], 0, &xml);
-fprintf(stderr, "%s\n", xml.data);
-return 0;*/
+
+//gnutls_x509_get_certificate_xml( &cert_list[0], 0, &xml);
+//fprintf(stderr, "%s\n", xml.data);
+//return 0;
 
 
 	printf(" - Certificate info:\n");
diff --git a/src/prime.c b/src/prime.c
index dfdf185c76..65df47f977 100644
--- a/src/prime.c
+++ b/src/prime.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include "prime-gaa.h"
 #include <gcrypt.h>
-#include "../lib/gnutls.h"
+#include <gnutls/gnutls.h>
 #include "../lib/defines.h"
 
 MPI _gcry_generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
diff --git a/src/serv.c b/src/serv.c
index 913644dc6f..1d9749b2b1 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -31,8 +31,8 @@
 #include <arpa/inet.h>
 #include <string.h>
 #include <unistd.h>
-#include "../lib/gnutls.h"
-#include "../libextra/extra.h"
+#include <gnutls/gnutls.h>
+#include <gnutls/extra.h>
 #include "common.h"
 #include <signal.h>
 #include "serv-gaa.h"
@@ -600,7 +600,6 @@ int main(int argc, char **argv)
 	    	time_t tt;
 	    	char* ctt;
 
-		int yes = 1;
 /* new list entry for the connection */
 		lappend (listener_list);
 		j = listener_list.tail;
diff --git a/src/tests.c b/src/tests.c
index f17b6d9913..afb18c20a1 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include "../lib/gnutls.h"
-#include "../libextra/extra.h"
+#include <gnutls/gnutls.h>
+#include <gnutls/extra.h>
 #include <tests.h>
 #include <unistd.h>
 #include <signal.h>
diff --git a/src/tls_test.c b/src/tls_test.c
index 2bf0befe19..8100fbd525 100644
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -27,8 +27,8 @@
 #include <arpa/inet.h>
 #include <string.h>
 #include <unistd.h>
-#include "../lib/gnutls.h"
-#include "../libextra/extra.h"
+#include <gnutls/gnutls.h>
+#include <gnutls/extra.h>
 #include <sys/time.h>
 #include <signal.h>
 #include <netdb.h>