From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 22 May 2010 08:06:50 +0000 (+0200)
Subject: Export all symbols from C++ library. This library doesn't contain any
X-Git-Tag: gnutls_2_11_3~286
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a85fffd50b34e8d5b9b8d1d699421ec2c0ee8dca;p=thirdparty%2Fgnutls.git

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 e0291c00c0..70145bdc66 100644
--- 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 3103884e59..4fd7bfe750 100644
--- 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 3b06384078..316bf8229e 100644
--- 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)