wip hacks to handle version symbols
This commit is contained in:
@@ -395,7 +395,8 @@ PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
|
||||
if test "$os_win32" != yes; then
|
||||
# libtool option to control which symbols are exported
|
||||
# right now, symbols starting with _ are not exported
|
||||
LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
|
||||
LIBTOOL_EXPORT_OPTIONS=
|
||||
#'-export-symbols-regex "^[[^_]].*"'
|
||||
else
|
||||
# We currently use .def files on Windows (for gdk and gtk)
|
||||
LIBTOOL_EXPORT_OPTIONS=
|
||||
@@ -1591,6 +1592,9 @@ fi
|
||||
|
||||
GOBJECT_INTROSPECTION_CHECK([0.9.3])
|
||||
|
||||
GTK_VERSION_FLAGS="-Wl,--version-script=\$(top_srcdir)/gtk2.versions"
|
||||
AC_SUBST(GTK_VERSION_FLAGS)
|
||||
|
||||
##################################################
|
||||
# Checks for gtk-doc and docbook-tools
|
||||
##################################################
|
||||
|
||||
@@ -52,6 +52,7 @@ endif
|
||||
# we use the general approach here
|
||||
LDADD = \
|
||||
$(GTK_LINK_FLAGS) \
|
||||
$(GTK_VERSION_FLAGS) \
|
||||
-version-info $(LT_VERSION_INFO) \
|
||||
-export-dynamic \
|
||||
-rpath $(libdir) \
|
||||
|
||||
@@ -132,6 +132,7 @@ deps =
|
||||
# we use the general approach here
|
||||
libtool_opts = \
|
||||
-version-info $(LT_VERSION_INFO) \
|
||||
$(GTK_VERSION_FLAGS) \
|
||||
-export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) \
|
||||
-rpath $(libdir) $(libgtk_target_ldflags)
|
||||
|
||||
|
||||
@@ -639,6 +639,8 @@ _gtk_module_has_mixed_deps (GModule *module_to_check)
|
||||
gpointer func;
|
||||
gboolean result;
|
||||
|
||||
return FALSE;
|
||||
|
||||
if (!module_to_check)
|
||||
module = g_module_open (NULL, 0);
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user