m4_define([gtk_major_version], [2])
m4_define([gtk_minor_version], [90])
-m4_define([gtk_micro_version], [5])
+m4_define([gtk_micro_version], [7])
m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
m4_define([gtk_binary_version], [3.0.0])
# required versions of other packages
-m4_define([glib_required_version], [2.25.9])
+m4_define([glib_required_version], [2.25.15])
m4_define([pango_required_version], [1.20])
m4_define([atk_required_version], [1.29.2])
-m4_define([cairo_required_version], [1.6])
+m4_define([cairo_required_version], [1.9.10])
m4_define([gdk_pixbuf_required_version], [2.21.0])
AC_CHECK_HEADERS(crt_externs.h)
AC_CHECK_FUNCS(_NSGetEnviron)
+AC_MSG_CHECKING(whether to build dynamic modules)
+
AC_ARG_ENABLE(modules,
[AC_HELP_STRING([--disable-modules],
[disable dynamic module loading])])
#
# Check for basic X packages; we use pkg-config if available
#
- if $PKG_CONFIG --exists x11 xext xrender; then
+ if $PKG_CONFIG --exists x11 xext; then
have_base_x_pc=true
- X_PACKAGES="$X_PACKAGES x11 xext xrender"
- x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
- X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
+ X_PACKAGES="$X_PACKAGES x11 xext"
+ x_libs="`$PKG_CONFIG --libs x11 xext`"
+ X_CFLAGS="`$PKG_CONFIG --cflags x11 xext`"
# Strip out any .la files that pkg-config might give us (this happens
# with -uninstalled.pc files)
fi
x_cflags="$X_CFLAGS"
- x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
+ x_libs_for_checks="$X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
- GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS"
+ GTK_DEP_LIBS_FOR_X="$X_LIBS -lX11 $X_EXTRA_LIBS"
fi
# Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
AC_CHECK_FUNC(XextFindDisplay, :,
AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
- AC_CHECK_FUNC(XRenderQueryExtension, :,
- AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.]))
# Check for xReply
# into the pkg-config files
#
if test $enable_explicit_deps != yes ; then
- GDK_PACKAGES="$PANGO_PACKAGES"
+ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
GDK_EXTRA_LIBS=
fi
# GObject introspection
##################################################
-GOBJECT_INTROSPECTION_CHECK([0.6.14])
+GOBJECT_INTROSPECTION_CHECK([0.9.0])
##################################################
# Checks for gtk-doc and docbook-tools
gdk_wc="\$gdk_wc
#define GDK_HAVE_BROKEN_WCTYPE 1"
fi
-
-
])
+dnl
+dnl Check for -Bsymbolic-functions linker flag used to avoid
+dnl intra-library PLT jumps, if available.
+dnl
+AC_ARG_ENABLE(Bsymbolic,
+ [AC_HELP_STRING([--disable-Bsymbolic],
+ [avoid linking with -Bsymbolic])],,
+ [SAVED_LDFLAGS="${LDFLAGS}"
+ AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
+ LDFLAGS=-Wl,-Bsymbolic-functions
+ AC_TRY_LINK([], [int main (void) { return 0; }],
+ AC_MSG_RESULT(yes)
+ enable_Bsymbolic=yes,
+ AC_MSG_RESULT(no)
+ enable_Bsymbolic=no)
+ LDFLAGS="${SAVED_LDFLAGS}"])
+
+if test "x${enable_Bsymbolic}" == "xyes"; then
+ GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions
+fi
+AC_SUBST(GTK_LINK_FLAGS)
+
AC_CONFIG_FILES([
config.h.win32
gtk-zip.sh