m4_define([gtk_major_version], [3])
m4_define([gtk_minor_version], [5])
-m4_define([gtk_micro_version], [5])
+m4_define([gtk_micro_version], [17])
m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
# required versions of other packages
m4_define([glib_required_version], [2.33.1])
m4_define([pango_required_version], [1.30.0])
-m4_define([atk_required_version], [2.2.0])
+m4_define([atk_required_version], [2.5.3])
m4_define([cairo_required_version], [1.10.0])
m4_define([gdk_pixbuf_required_version], [2.26.0])
m4_define([introspection_required_version], [1.32.0])
have_gio_unix=yes
GDK_WINDOWING="$GDK_WINDOWING
#define GDK_WINDOWING_WAYLAND"
- WAYLAND_PACKAGES="wayland-client xkbcommon "
+ WAYLAND_PACKAGES="wayland-client xkbcommon wayland-cursor"
if test "x$enable_wayland_cairo_gl" == "xyes"; then
WAYLAND_PACKAGES="$WAYLAND_PACKAGES wayland-egl egl"
fi
AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlibint.h>]],
- [[xReply *rep;]])],
+ [[xReply *rep = NULL;
+ rep = rep;]])],
[AC_MSG_RESULT([no])],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>]],
- [[xReply *rep;]])],
+ [[xReply *rep = NULL;
+ rep = rep;]])],
[AC_MSG_RESULT([yes])
AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], [1],
[Define if <X11/extensions/XIproto.h> needed for xReply])],
# Check for Accessibility Toolkit flags
########################################
-AC_ARG_WITH(atk-bridge,
- AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]),
- :, with_atk_bridge=$enable_x11_backend)
-
-if test x$with_atk_bridge != xno; then
+if test x$enable_x11_backend = xyes; then
ATK_PACKAGES="atk atk-bridge-2.0"
- AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0])
else
ATK_PACKAGES="atk"
fi
GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
-AC_CHECK_PROG(DB2HTML, db2html, true, false)
-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
-
AC_ARG_ENABLE(man,
[AS_HELP_STRING([--enable-man],
- [regenerate man pages from Docbook [default=no]])],
- [enable_man=yes],
- [enable_man=no])
-
-if test "${enable_man}" != no; then
- dnl
- dnl Check for xsltproc
- dnl
+ [generate man pages [default=auto]])],,
+ enable_man=maybe)
+
+if test "$enable_man" != no; then
AC_PATH_PROG([XSLTPROC], [xsltproc])
if test -z "$XSLTPROC"; then
+ if test "$enable_man" = yes ; then
+ AC_MSG_ERROR([xsltproc is required for --enable-man])
+ fi
enable_man=no
fi
+fi
- dnl check for DocBook DTD and stylesheets in the local catalog.
+if test "$enable_man" != no; then
+ dnl check for DocBook DTD in the local catalog
JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
- [DocBook XML DTD V4.1.2],,enable_man=no)
+ [DocBook XML DTD V4.1.2], [have_docbook_dtd=yes], [have_docbook_dtd=no])
+ if test "$have_docbook_dtd" != yes; then
+ if test "$enable_man" = yes ; then
+ AC_MSG_ERROR([DocBook DTD is required for --enable-man])
+ fi
+ enable_man=no
+ fi
+fi
+
+if test "$enable_man" != no; then
+ dnl check for DocBook XSL stylesheets in the local catalog
JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
- [DocBook XSL Stylesheets],,enable_man=no)
+ [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
+ if test "$have_docbook_dtd" != yes; then
+ if test "$enable_man" = yes ; then
+ AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
+ fi
+ enable_man=no
+ fi
fi
-AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
+AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+AC_MSG_CHECKING([whether to generate man pages])
+if test "$enable_man" != no; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+fi
##################################################
# Output commands