diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-05-22 10:06:50 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-05-22 10:06:50 +0200 |
| commit | 25743fd804de1cca0a2fb1538ed40f378a7aba7d (patch) | |
| tree | a9b3ba4a1f0bd490faa6a396742b64dabcf3ab04 | |
| parent | 0627fb68a819799119d46134623d59911ee4b936 (diff) | |
| download | gnutls-25743fd804de1cca0a2fb1538ed40f378a7aba7d.tar.gz | |
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.
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/libgnutlsxx.map | 17 | ||||
| -rw-r--r-- | lib/m4/hooks.m4 | 4 |
3 files changed, 9 insertions, 14 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 51137edc28..48c07039fb 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -171,7 +171,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 b3e2e76924..c782f31c5a 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 2582b7dc0f..a70eaabd50 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) |