# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [5])
-m4_define([gtk_micro_version], [3])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_minor_version], [6])
+m4_define([gtk_micro_version], [2])
+m4_define([gtk_interface_age], [2])
m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
m4_define([gtk_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])
AC_PROG_CC
AC_PROG_CC_C_O
AC_PROG_CC_STDC
+AC_PROG_MKDIR_P
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_MSG_CHECKING([for native Win32])
LIB_EXE_MACHINE_FLAG=X86
EXE_MANIFEST_ARCHITECTURE=X86
+DISABLE_ON_W32=''
case "$host" in
*-*-mingw*)
+ dnl Comment-out certain gtk3.types.in lines
+ DISABLE_ON_W32='%'
os_win32=yes
gio_can_sniff=no
MATH_LIB=
esac
AC_MSG_RESULT([$os_win32])
+AC_SUBST(DISABLE_ON_W32)
AC_SUBST(LIB_EXE_MACHINE_FLAG)
AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
AM_CONDITIONAL(USE_WIN32, false)
fi
+DISABLE_ON_QUARTZ=''
if test "x$enable_quartz_backend" = xyes; then
cairo_backends="$cairo_backends cairo-quartz"
GDK_BACKENDS="$GDK_BACKENDS quartz"
GDK_WINDOWING="$GDK_WINDOWING
#define GDK_WINDOWING_QUARTZ"
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
+ DISABLE_ON_QUARTZ='%'
AM_CONDITIONAL(USE_QUARTZ, true)
if test "x$quartz_relocation" = xyes; then
AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.])
fi
+ # Pull in gio-unix for GDesktopAppInfo usage, see at least
+ # gdkapplaunchcontext-x11.c
+ have_gio_unix=yes
else
AM_CONDITIONAL(USE_QUARTZ, false)
fi
+AC_SUBST(DISABLE_ON_QUARTZ)
-
-if test "x$enable_broadway_backend" == xyes; then
+if test "x$enable_broadway_backend" = xyes; then
GDK_BACKENDS="$GDK_BACKENDS broadway"
cairo_backends="$cairo_backends cairo"
GDK_WINDOWING="$GDK_WINDOWING
AM_CONDITIONAL(USE_BROADWAY, false)
fi
-if test "x$enable_wayland_backend" == "xyes"; then
- if test "x$enable_wayland_cairo_gl" == "xyes"; then
+if test "x$enable_wayland_backend" = "xyes"; then
+ if test "x$enable_wayland_cairo_gl" = "xyes"; then
# Wayland can use cairo-gl
cairo_backends="$cairo_backends cairo-gl"
AC_DEFINE(GDK_WAYLAND_USE_EGL, [1], [Whether to use EGL in Wayland backend])
have_gio_unix=yes
GDK_WINDOWING="$GDK_WINDOWING
#define GDK_WINDOWING_WAYLAND"
- WAYLAND_PACKAGES="wayland-client xkbcommon "
- if test "x$enable_wayland_cairo_gl" == "xyes"; then
+ WAYLAND_PACKAGES="wayland-client xkbcommon wayland-cursor"
+ if test "x$enable_wayland_cairo_gl" = "xyes"; then
WAYLAND_PACKAGES="$WAYLAND_PACKAGES wayland-egl egl"
fi
AM_CONDITIONAL(USE_WAYLAND, true)
# Check for round(), rint(), isnan(), isinf() and nearbyint()
AC_CHECK_LIB(m,round,,)
-AC_CHECK_FUNCS(round rint isnan isinf nearbyint)
+AC_CHECK_FUNCS(round rint nearbyint)
+AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
# Checks for gdkspawn
AC_CHECK_HEADERS(crt_externs.h)
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
########################################
-ATK_PACKAGES=atk
+if test x$enable_x11_backend = xyes; then
+ ATK_PACKAGES="atk atk-bridge-2.0"
+else
+ ATK_PACKAGES="atk"
+fi
+
PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
-GTK_PRIVATE_PACKAGES=""
+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES"
if test "x$enable_x11_backend" = xyes; then
GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
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
docs/reference/gdk/Makefile
docs/reference/gdk/version.xml
docs/reference/gtk/Makefile
+docs/reference/gtk/gtk3.types
docs/reference/gtk/version.xml
docs/reference/libgail-util/Makefile
docs/reference/libgail-util/version.xml
projects / ~andy / gtk / blobdiff