# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [90])
-m4_define([gtk_micro_version], [7])
+m4_define([gtk_minor_version], [91])
+m4_define([gtk_micro_version], [1])
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.15])
+m4_define([glib_required_version], [2.27.0])
m4_define([pango_required_version], [1.20])
m4_define([atk_required_version], [1.29.2])
-m4_define([cairo_required_version], [1.9.10])
+m4_define([cairo_required_version], [1.10.0])
m4_define([gdk_pixbuf_required_version], [2.21.0])
+GLIB_REQUIRED_VERSION=glib_required_version
+PANGO_REQUIRED_VERSION=pango_required_version
+ATK_REQUIRED_VERSION=atk_required_version
+CAIRO_REQUIRED_VERSION=cairo_required_version
+GDK_PIXBUF_REQUIRED_VERSION=gdk_pixbuf_required_version
+AC_SUBST(GLIB_REQUIRED_VERSION)
+AC_SUBST(PANGO_REQUIRED_VERSION)
+AC_SUBST(ATK_REQUIRED_VERSION)
+AC_SUBST(CAIRO_REQUIRED_VERSION)
+AC_SUBST(GDK_PIXBUF_REQUIRED_VERSION)
AC_INIT([gtk+], [gtk_version],
AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
[turn on debugging @<:@default=debug_default@:>@]),,
enable_debug=debug_default)
-AC_ARG_ENABLE(shm,
- [AC_HELP_STRING([--enable-shm],
- [support shared memory if available [default=yes]])],,
- [enable_shm="yes"])
AC_ARG_ENABLE(xkb,
[AC_HELP_STRING([--enable-xkb],
[support XKB [default=maybe]])],,
[AC_HELP_STRING([--disable-rebuilds],
[disable all source autogeneration rules])],,
[enable_rebuilds=yes])
-AC_ARG_ENABLE(visibility,
- [AC_HELP_STRING([--disable-visibility],
- [do not use ELF visibility attributes])],,
- [enable_visibility=yes])
AC_ARG_WITH(xinput,
[AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
gdktarget=x11
fi
-AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
+AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz]] select non-default GDK target],
gdktarget=$with_gdktarget)
AC_SUBST(gdktarget)
case $gdktarget in
- x11|win32|quartz|directfb) ;;
- *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
+ x11|win32|quartz) ;;
+ *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz or win32.]);;
esac
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
fi
-if test "x$enable_visibility" = "xno"; then
- GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY"
-fi
-
-
AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}",
[Define if debugging is enabled])
atk >= atk_required_version dnl
pango >= pango_required_version dnl
cairo >= cairo_required_version dnl
+ cairo-gobject >= cairo_required_version dnl
gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
## In addition to checking that cairo is present, we also need to
[Define if _NL_PAPER_WIDTH is available])
fi
-# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
-AC_MSG_CHECKING(for sigsetjmp)
-AC_TRY_LINK([#include <setjmp.h>], [
-sigjmp_buf env;
-sigsetjmp(env, 0);
-], gtk_ok=yes, gtk_ok=no)
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
- AC_DEFINE(HAVE_SIGSETJMP, 1,
- [Define to 1 if sigsetjmp is available])
-fi
-
# i18n stuff
ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
AM_GLIB_GNU_GETTEXT
CFLAGS="$gtk_save_CFLAGS"
- # Xshm checks
-
- if test "x$enable_shm" = "xyes"; then
- # Check for the XShm extension, normally in Xext
- AC_CHECK_FUNC(XShmAttach,
- :,
- # On AIX, it is in XextSam instead
- [AC_CHECK_LIB(XextSam, XShmAttach,
- [GTK_ADD_LIB(x_extra_libs,XextSam)])])
- fi
-
- if test "x$enable_shm" = "xyes"; then
- # Check for shared memory
- AC_CHECK_HEADER(sys/ipc.h,
- AC_DEFINE(HAVE_IPC_H, 1,
- [Define to 1 if ipc.h is available]),
- no_sys_ipc=yes)
- AC_CHECK_HEADER(sys/shm.h,
- AC_DEFINE(HAVE_SHM_H, 1,
- [Define to 1 if shm.h is available]),
- no_sys_shm=yes)
-
- # Check for the X shared memory extension header file
- have_xshm=no
- AC_MSG_CHECKING(X11/extensions/XShm.h)
- if test "x$no_xext_lib" = "xyes"; then
- :
- else
- gtk_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $x_cflags"
- AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/XShm.h>
-], [XShmSegmentInfo *x_shm_info;], have_xshm=yes)
- CFLAGS="$gtk_save_CFLAGS"
- fi
- AC_MSG_RESULT($have_xshm)
- if test $have_xshm = yes ; then
- AC_DEFINE(HAVE_XSHM_H, 1,
- [Define to 1 if xshm.h is available])
- fi
- fi
-
if test "x$enable_xinerama" = "xyes"; then
# Check for Xinerama extension (Solaris impl or Xfree impl)
gtk_save_cppflags="$CPPFLAGS"
AM_CONDITIONAL(USE_QUARTZ, false)
fi
-if test "x$gdktarget" = "xdirectfb"; then
- DIRECTFB_REQUIRED_VERSION=1.0.0
- AC_MSG_CHECKING(for DirectFB)
-
- PKG_CHECK_MODULES(DIRECTFB, [directfb >= $DIRECTFB_REQUIRED_VERSION])
- AM_CONDITIONAL(USE_DIRECTFB, true)
-else
- AM_CONDITIONAL(USE_DIRECTFB, false)
-fi
-
-
# Check for Pango flags
if test "x$gdktarget" = "xwin32"; then
LIBS="$gtk_save_LIBS"
fi
-GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0"
+GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
if test "x$gdktarget" = "xx11"; then
GTK_PACKAGES="$GTK_PACKAGES pangoft2"
fi
# GObject introspection
##################################################
-GOBJECT_INTROSPECTION_CHECK([0.9.0])
+GOBJECT_INTROSPECTION_CHECK([0.9.3])
##################################################
# Checks for gtk-doc and docbook-tools
elif test "x$gdktarget" = "xquartz" ; then
gdk_windowing='
#define GDK_WINDOWING_QUARTZ'
-elif test "x$gdktarget" = "xdirectfb" ; then
- gdk_windowing='
-#define GDK_WINDOWING_DIRECTFB'
fi
if test x$gdk_wchar_h = xyes; then
gdk/win32/rc/Makefile
gdk/win32/rc/gdk.rc
gdk/quartz/Makefile
-gdk/directfb/Makefile
gdk/tests/Makefile
gtk/Makefile
gtk/makefile.msc
AC_OUTPUT
echo "configuration:
- target: $gdktarget"
+ target: $gdktarget"