# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [3])
-m4_define([gtk_micro_version], [5])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_minor_version], [4])
+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],
m4_define([gtk_binary_version], [3.0.0])
# required versions of other packages
-m4_define([glib_required_version], [2.31.6])
-m4_define([pango_required_version], [1.29.0])
-m4_define([atk_required_version], [2.1.5])
+m4_define([glib_required_version], [2.32.0])
+m4_define([pango_required_version], [1.30.0])
+m4_define([atk_required_version], [2.2.0])
m4_define([cairo_required_version], [1.10.0])
-m4_define([gdk_pixbuf_required_version], [2.23.5])
-m4_define([introspection_required_version], [0.10.1])
+m4_define([gdk_pixbuf_required_version], [2.26.0])
+m4_define([introspection_required_version], [1.32.0])
GLIB_REQUIRED_VERSION=glib_required_version
PANGO_REQUIRED_VERSION=pango_required_version
ATK_REQUIRED_VERSION=atk_required_version
[AS_HELP_STRING([--enable-xinerama],
[support Xinerama extension [default=maybe]])],,
[enable_xinerama="maybe"])
-AC_ARG_ENABLE(xinput,
- [AS_HELP_STRING([--enable-xinput],
- [support XInput extension [default=yes]])],,
- [enable_xinput="maybe"])
AC_ARG_ENABLE(xrandr,
[AS_HELP_STRING([--enable-xrandr],
[support XRandR extension [default=maybe]])],,
[enable bundle-based relocation functions])],
[quartz_relocation=yes])
+AC_ARG_ENABLE(wayland-cairo-gl,
+ AS_HELP_STRING([--enable-wayland-cairo-gl],
+ [enable the use of Cairo GL in the Wayland backend]),
+ [enable_wayland_cairo_gl=yes])
+
+
cairo_backends=
backend_immodules=
+have_gio_unix=no
GDK_BACKENDS=
GDK_EXTRA_LIBS=
GDK_EXTRA_CFLAGS=
GDK_WINDOWING=
-GIO_PACKAGE=gio-2.0
PANGO_PACKAGES="pango pangocairo"
if test "$enable_x11_backend" = "yes"; then
GDK_BACKENDS="$GDK_BACKENDS x11"
# Pull in gio-unix for GDesktopAppInfo usage, see at least
# gdkapplaunchcontext-x11.c
- GIO_PACKAGE=gio-unix-2.0
+ have_gio_unix=yes
backend_immodules="$backend_immodules,xim"
GDK_WINDOWING="$GDK_WINDOWING
#define GDK_WINDOWING_X11"
fi
if test "x$enable_wayland_backend" == "xyes"; then
- # Wayland uses cairo-gl
- cairo_backends="$cairo_backends cairo-gl"
+ 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])
+ else
+ # For the cairo image backend
+ cairo_backends="$cairo_backends cairo"
+ fi
GDK_BACKENDS="$GDK_BACKENDS wayland"
- GIO_PACKAGE=gio-unix-2.0
+ have_gio_unix=yes
GDK_WINDOWING="$GDK_WINDOWING
#define GDK_WINDOWING_WAYLAND"
- WAYLAND_PACKAGES="wayland-client xkbcommon wayland-egl egl"
+ WAYLAND_PACKAGES="wayland-client xkbcommon "
+ if test "x$enable_wayland_cairo_gl" == "xyes"; then
+ WAYLAND_PACKAGES="$WAYLAND_PACKAGES wayland-egl egl"
+ fi
AM_CONDITIONAL(USE_WAYLAND, true)
else
AM_CONDITIONAL(USE_WAYLAND, false)
AC_CHECK_FUNCS(getresuid)
AC_TYPE_UID_T
-# Check for uxtheme.h (for MS-Windows Engine)
-AC_MSG_CHECKING(for uxtheme.h)
-AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <uxtheme.h>]])],
- [gtk_uxtheme_h=yes], [gtk_uxtheme_h=no])
-if test $gtk_uxtheme_h = yes; then
- AC_DEFINE(HAVE_UXTHEME_H, 1, [Have uxtheme.h include file])
-fi
-AC_MSG_RESULT($gtk_uxtheme_h)
-
# Check for round()
AC_CHECK_LIB(m,round,have_round=yes,have_round=no)
if test $have_round = yes; then
# Xext is optional, the chances a system has *none* of these things is so
# small that we just unconditionally require it.
AC_CHECK_FUNC(XOpenDisplay, :,
- AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
+ AC_MSG_ERROR([*** libX11 and libXext 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_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
# Check for xReply
[AC_MSG_RESULT([unknown])
AC_MSG_ERROR([xReply type unavailable. X11 is too old])])])
- # Check for XConvertCase, XInternAtoms (X11R6 specific)
-
- AC_CHECK_FUNCS(XConvertCase XInternAtoms)
-
- # Generic X11R6 check needed for XIM support; we could
- # probably use this to replace the above, but we'll
- # leave the separate checks for XConvertCase and XInternAtoms
- # for clarity
-
- have_x11r6=false
- AC_CHECK_FUNC(XAddConnectionWatch,
- have_x11r6=true)
-
- if $have_x11r6; then
- AC_DEFINE(HAVE_X11R6, 1, [Define if we have X11R6])
- fi
- AM_CONDITIONAL(HAVE_X11R6, $have_x11r6)
-
# Check for XKB support.
if test "x$enable_xkb" = "xyes"; then
AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent]))
# set up things for XInput
- if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
- have_xinput=yes
-
- AC_DEFINE(XINPUT_XFREE, 1,
- [Define to 1 if XFree XInput should be used])
+ if $PKG_CONFIG --exists "xi" ; then
X_PACKAGES="$X_PACKAGES xi"
GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xi"
AC_CHECK_HEADER(X11/extensions/XInput2.h,
have_xinput2=yes
- X_EXTENSIONS="$X_EXTENSIONS XI2"
- AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]),
- X_EXTENSIONS="$X_EXTENSIONS XInput")
-
- else
- AC_DEFINE(XINPUT_NONE, 1,
- [Define to 1 if no XInput should be used])
- fi
-
- AM_CONDITIONAL(XINPUT_XFREE, test "x$have_xinput" = "xyes")
- AM_CONDITIONAL(XINPUT_2, test "x$have_xinput2" = "xyes")
-
- if test "x$enable_xinput" = "xyes" ; then
- if test "x$have_xinput" != "xyes" -a "x$have_xinput2" != "xyes" ; then
- AC_MSG_ERROR([*** XInput extension not found. Check 'config.log' for more details.])
+ AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]))
+
+ gtk_save_LIBS="$LIBS"
+ LIBS="$LIBS -lXi"
+
+ # Note that we also check that the XIScrollClassInfo struct is defined,
+ # because at least Ubuntu Oneiric seems to have XIAllowTouchEvents(), but not the XIScrollClassInfo struct.
+ AC_CHECK_FUNC([XIAllowTouchEvents],
+ [AC_CHECK_MEMBER([XIScrollClassInfo.number],
+ have_xinput2_2=yes
+ AC_DEFINE(XINPUT_2_2, 1, [Define to 1 if XInput 2.2 is available]),
+ have_xinput2_2=no,
+ [[#include <X11/extensions/XInput2.h>]])])
+ LIBS="$gtk_save_LIBS"
+
+ if test "x$have_xinput2_2" = "xyes"; then
+ X_EXTENSIONS="$X_EXTENSIONS XI2.2"
+ else
+ X_EXTENSIONS="$X_EXTENSIONS XI2"
fi
fi
+ AS_IF([test "x$have_xinput2" != "xyes"],
+ [AC_MSG_ERROR([*** XInput2 extension not found. Check 'config.log' for more details.])])
+
# Check for the RANDR extension
if test x"$enable_xrandr" != xno; then
if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
else
XPACKAGES=
- AM_CONDITIONAL(XINPUT_XFREE, false)
- AM_CONDITIONAL(XINPUT_2, false)
AM_CONDITIONAL(USE_X11, false)
- AM_CONDITIONAL(HAVE_X11R6, false)
+fi
+
+# Check for gio-unix
+if test "$have_gio_unix" = "yes"; then
+ GDK_GIO_PACKAGE=gio-unix-2.0
+ AC_DEFINE([HAVE_GIO_UNIX], [1],
+ [Define if gio-unix is available])
+else
+ GDK_GIO_PACKAGE=gio-2.0
fi
# Check for Pango flags
LDFLAGS="$saved_ldflags"
GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo cairo-gobject"
-GDK_PRIVATE_PACKAGES="$GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends"
+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends"
if test "x$enable_x11_backend" = xyes; then
GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
fi
if test "x$enable_x11_backend" = xyes; then
GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
fi
+if test "$have_gio_unix" = "yes"; then
+ GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0"
+fi
GTK_EXTRA_LIBS=
GTK_EXTRA_CFLAGS=
CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
if test $CUPS_API_MAJOR -gt 1 -o \
- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
- AC_DEFINE(HAVE_CUPS_API_1_2, 1,
- [Define to 1 if CUPS 1.2 API is available])
+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
+ AC_MSG_ERROR([CUPS >= 1.2 not found])
+ fi
+ if test $CUPS_API_MAJOR -gt 1 -o \
+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
+ AC_DEFINE(HAVE_CUPS_API_1_6, 1,
+ [Define to 1 if CUPS 1.6 API is available])
+
fi
AC_SUBST(CUPS_API_MAJOR)
G_BEGIN_DECLS
-/* These macros are used to mark deprecated functions in GDK and
- * GTK+ headers, and thus have to be exposed in installed headers.
- * But please do *not* use them in other projects. Instead, use
- * G_DEPRECATED or define your own wrappers around it.
- */
-
-#ifdef GDK_DISABLE_DEPRECATION_WARNINGS
-#define GDK_DEPRECATED
-#define GDK_DEPRECATED_FOR(f)
-#else
-#define GDK_DEPRECATED G_DEPRECATED
-#define GDK_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
-#endif
-
_______EOF
cat >>$outfile <<_______EOF
gtk+-3.0.pc
gtk+-unix-print-3.0.pc
gail-3.0.pc
-gtk+-3.0-uninstalled.pc
-gail-3.0-uninstalled.pc
m4macros/Makefile
po/Makefile.in
po-properties/Makefile.in
demos/gtk-demo/Makefile
demos/gtk-demo/geninclude.pl
demos/pixbuf-demo/Makefile
+demos/widget-factory/Makefile
examples/Makefile
tests/Makefile
tests/a11y/Makefile
tests/css/Makefile
tests/css/parser/Makefile
tests/reftests/Makefile
+tests/visuals/Makefile
docs/Makefile
docs/reference/Makefile
docs/reference/gdk/Makefile
gdk/quartz/Makefile
gdk/wayland/Makefile
gdk/tests/Makefile
+gdk/gdkversionmacros.h
gtk/Makefile
gtk/makefile.msc
gtk/gtkversion.h
modules/Makefile
modules/engines/Makefile
modules/engines/pixbuf/Makefile
-modules/engines/ms-windows/Makefile
-modules/engines/ms-windows/Theme/Makefile
-modules/engines/ms-windows/Theme/gtk-3.0/Makefile
modules/input/Makefile
modules/printbackends/Makefile
modules/printbackends/cups/Makefile