New install directory for headers is /gnutls

10 files changed, 14 insertions, 13 deletions

diff --git a/configure.in b/configure.in
index 42a8b6b8df..0df645dfe9 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,9 @@ AC_DEFINE_UNQUOTED(T_CPU, "$target_cpu")
 AC_DEFINE_UNQUOTED(T_VENDOR, "$target_vendor")
 AC_DEFINE_UNQUOTED(T_OS, "$target_os")
 
+test "x$includedir" = 'x${prefix}/include' && \
+        includedir='$(prefix)/include/gnutls'
+
 dnl Gnutls Version
 GNUTLS_MAJOR_VERSION=0
 GNUTLS_MINOR_VERSION=5
@@ -21,7 +24,7 @@ AM_INIT_AUTOMAKE(gnutls, $GNUTLS_VERSION)
 AM_CONFIG_HEADER(config.h)
 
 dnl This is the library version
-GNUTLS_MOST_RECENT_INTERFACE=6
+GNUTLS_MOST_RECENT_INTERFACE=5
 GNUTLS_CURRENT_INTERFACE_IMPLEMENTATION_NUMBER=$GNUTLS_MICRO_VERSION
 GNUTLS_OLDEST_INTERFACE=5
 
@@ -390,8 +393,6 @@ AC_CONFIG_FILES([Makefile src/Makefile libextra/Makefile lib/Makefile \
 lib/libgnutls-config libextra/libgnutls-extra-config \
 doc/Makefile src/x509/Makefile src/srp/Makefile src/openpgp/Makefile \
 doc/tex/Makefile doc/tex/cover.tex doc/scripts/Makefile \
-tests/Makefile ])
-
+tests/Makefile])
 
 AC_OUTPUT
-
diff --git a/doc/tex/ex1.tex b/doc/tex/ex1.tex
index 2070bbd39d..69004d5f8b 100644
--- a/doc/tex/ex1.tex
+++ b/doc/tex/ex1.tex
@@ -6,7 +6,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <gnutls.h>
+#include <gnutls/gnutls.h>
 
 #define MAX_BUF 1024
 #define CRLFILE "crl.pem"
diff --git a/doc/tex/ex2.tex b/doc/tex/ex2.tex
index b0124aaf9c..a1dbaf2aec 100644
--- a/doc/tex/ex2.tex
+++ b/doc/tex/ex2.tex
@@ -6,7 +6,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <gnutls.h>
+#include <gnutls/gnutls.h>
 
 #define MAX_BUF 1024
 #define CRLFILE "crl.pem"
diff --git a/doc/tex/ex4.tex b/doc/tex/ex4.tex
index fc20cb1187..c19ba0f29b 100644
--- a/doc/tex/ex4.tex
+++ b/doc/tex/ex4.tex
@@ -6,7 +6,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <gnutls.h>
+#include <gnutls/gnutls.h>
 
 #define MAX_BUF 1024
 #define CRLFILE "crl.pem"
diff --git a/doc/tex/funcs.tex b/doc/tex/funcs.tex
index 9864d86e10..5648a1f206 100644
--- a/doc/tex/funcs.tex
+++ b/doc/tex/funcs.tex
@@ -8,7 +8,7 @@
 \section{\gnutlse{} library}
 These functions are only available in the GPL version of the
 library called ``gnutls-extra''. The prototypes for this library lie
-in ``gnutls-extra.h''.
+in ``gnutls/extra.h''.
 
 \input{gnutls-extra-api}
 
diff --git a/doc/tex/serv1.tex b/doc/tex/serv1.tex
index c45f6eec00..ead49227db 100644
--- a/doc/tex/serv1.tex
+++ b/doc/tex/serv1.tex
@@ -9,8 +9,8 @@
 #include <arpa/inet.h>
 #include <string.h>
 #include <unistd.h>
-#include <gnutls.h>
-#include <gnutls-extra.h>
+#include <gnutls/gnutls.h>
+#include <gnutls/extra.h>
 
 #define KEYFILE "key.pem"
 #define CERTFILE "cert.pem"
diff --git a/doc/tex/srp1.tex b/doc/tex/srp1.tex
index a3c354a749..01f5938b91 100644
--- a/doc/tex/srp1.tex
+++ b/doc/tex/srp1.tex
@@ -6,8 +6,8 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <gnutls.h>
-#include <gnutls-extra.h>
+#include <gnutls/gnutls.h>
+#include <gnutls/extra.h>
 
 #define MAX_BUF 1024
 #define USERNAME "user"
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 6e5879049e..9521cc62c5 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = -I../lib -I../libtasn1/lib/
-include_HEADERS = gnutls-extra.h gnutls-openssl.h
+include_HEADERS = extra.h openssl.h
 bin_SCRIPTS = libgnutls-extra-config
 
 m4datadir = $(datadir)/aclocal
diff --git a/libextra/gnutls-extra.h b/libextra/extra.h
index 4d2a38d8cd..4d2a38d8cd 100644
--- a/libextra/gnutls-extra.h
+++ b/libextra/extra.h
diff --git a/libextra/gnutls-openssl.h b/libextra/openssl.h
index 6f2c9482e3..6f2c9482e3 100644
--- a/libextra/gnutls-openssl.h
+++ b/libextra/openssl.h