X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.in;h=922c6fb1962cadc6ed41df51a83004479ab114c0;hb=d7681e7c34ed1a2838514c1bec0b949e8952e78c;hp=c7698412467ad5a3c6356b7c009dd764fb0cf860;hpb=dc0718bd7e95bb93e1c1c0fe715d3827e79a6080;p=~andy%2Fgtk diff --git a/configure.in b/configure.in index c76984124..922c6fb19 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ AC_PREREQ(2.54) m4_define([gtk_major_version], [2]) m4_define([gtk_minor_version], [3]) -m4_define([gtk_micro_version], [4]) +m4_define([gtk_micro_version], [5]) m4_define([gtk_version], [gtk_major_version.gtk_minor_version.gtk_micro_version]) m4_define([gtk_interface_age], [0]) @@ -29,8 +29,8 @@ m4_define([gtk_api_version], [2.0]) m4_define([gtk_binary_version], [2.2.0]) # required versions of other packages -m4_define([glib_required_version], [2.3.3]) -m4_define([pango_required_version], [1.2.0]) +m4_define([glib_required_version], [2.3.5]) +m4_define([pango_required_version], [1.3.5]) m4_define([atk_required_version], [1.0.1]) @@ -1418,6 +1418,26 @@ AC_SUBST(GTK_DEP_CFLAGS) AC_SUBST(GTK_DEBUG_FLAGS) AC_SUBST(GTK_XIM_FLAGS) +################################################################ +# Strip -export-dynamic from the link lines of various libraries +################################################################ + +# +# pkg-config --libs gmodule includes the "export_dynamic" flag, +# but this flag is only meaningful for executables. For libraries +# the effect is undefined; what it causes on Linux is that the +# export list from -export-symbols-regex is ignored and everything +# is exported +# +export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` +if test -n "$export_dynamic"; then + GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` + GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` + GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` + GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` +fi + + ################################################## # Checks for gtk-doc and docbook-tools ##################################################