Bug 622294 - More annotations for GVariant

[platform/upstream/glib.git] / configure.in

diff --git a/configure.in b/configure.in
index 29754c5..fd9d0c4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,7 @@ m4_define(glib_configure_in)
 #
 m4_define([glib_major_version], [2])
 m4_define([glib_minor_version], [25])
-m4_define([glib_micro_version], [10])
+m4_define([glib_micro_version], [11])
 m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
@@ -3634,6 +3634,21 @@ AC_SUBST(DBUS1_CFLAGS)
 AC_SUBST(DBUS1_LIBS)
 AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
 
+dnl
+dnl Check for -Bsymbolic-functions linker flag used to avoid
+dnl intra-library PLT jumps, if available.
+dnl
+SAVED_LDFLAGS="${LDFLAGS}"
+AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
+LDFLAGS=-Wl,-Bsymbolic-functions
+AC_TRY_LINK([], [int main (void) { return 0; }],
+            GLIB_LINK_FLAGS=-Wl[,]-Bsymbolic-functions
+            AC_MSG_RESULT(yes),
+            GLIB_LINK_FLAGS=
+            AC_MSG_RESULT(no))
+AC_SUBST(GLIB_LINK_FLAGS)
+LDFLAGS="${SAVED_LDFLAGS}"
+
 AC_CONFIG_FILES([
 glib-2.0.pc
 glib-2.0-uninstalled.pc