Export all symbols from C++ library. This library doesn't contain any

internal symbols anyway and there is no reason to mess with the C++ ABI
that hasn't got the problems of C.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e0291c00c0aba20660efe7f4bfcb5dcfecc3aa9d..70145bdc66de865b28e2f7b1fef298ce53fe37f9 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -176,7 +176,7 @@ lib_LTLIBRARIES += libgnutlsxx.la
 libgnutlsxx_la_SOURCES = gnutlsxx.cpp libgnutlsxx.map
 
 libgnutlsxx_la_LDFLAGS = -no-undefined \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+       -version-info $(CXX_LT_CURRENT):$(CXX_LT_REVISION):$(CXX_LT_AGE)
 
 libgnutlsxx_la_LIBADD = libgnutls.la
 

diff --git a/lib/libgnutlsxx.map b/lib/libgnutlsxx.map
index 3103884e599140aca47c2d7e40976999ebc303af..4fd7bfe750879e815cd490dd14218492171f9146 100644 (file)
--- a/lib/libgnutlsxx.map
+++ b/lib/libgnutlsxx.map
@@ -20,22 +20,13 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA
 
-GNUTLS_1_6
+GNUTLS_2_10
 {
   global:
     extern "C++" {
-      # To specify a class we also need to specify its typeinfo,
-      # typeinfo name and vtable objects.
-      # For example for class gnutls::psk_client_credentials,
-      # we need to declare this 4 lines:
-      #
-      # gnutls::psk_client_credentials::*;
-      # "typeinfo for gnutls::psk_client_credentials";
-      # "typeinfo name for gnutls::psk_client_credentials";
-      # "vtable for gnutls::psk_client_credentials";
+      # Allow all symbols for C++. It has its own way to keep
+      # symbol namespaces.
 
-      *gnutls::*;
+      *;
   };
-
-  local: *;
 };

diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 3b06384078c9841feacdb7bf6785865a3a232ddf..316bf8229e2a2ccdbb1f5e9ba6ad00e10bc7569b 100644 (file)
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -30,6 +30,10 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   AC_SUBST(LT_REVISION, 6)
   AC_SUBST(LT_AGE, 16)
 
+  AC_SUBST(CXX_LT_CURRENT, 27)
+  AC_SUBST(CXX_LT_REVISION, 0)
+  AC_SUBST(CXX_LT_AGE, 0)
+
   # Used when creating the Windows libgnutls-XX.def files.
   DLL_VERSION=`expr ${LT_CURRENT} - ${LT_AGE}`
   AC_SUBST(DLL_VERSION)