m4_define([gtk_major_version], [2])
m4_define([gtk_minor_version], [13])
-m4_define([gtk_micro_version], [5])
+m4_define([gtk_micro_version], [6])
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], [2.10.0])
# required versions of other packages
-m4_define([glib_required_version], [2.17.4])
+m4_define([glib_required_version], [2.17.6])
m4_define([pango_required_version], [1.20])
m4_define([atk_required_version], [1.13.0])
m4_define([cairo_required_version], [1.6])
MATH_LIB=-lm
AC_MSG_CHECKING([for native Win32])
+LIB_EXE_MACHINE_FLAG=X86
case "$host" in
*-*-mingw*)
os_win32=yes
+ gio_can_sniff=no
MATH_LIB=
+ case "$host" in
+ x86_64-*-*)
+ LIB_EXE_MACHINE_FLAG=X64
+ ;;
+ esac
;;
*)
os_win32=no
esac
AC_MSG_RESULT([$os_win32])
+AC_SUBST(LIB_EXE_MACHINE_FLAG)
+
case $host in
*-*-linux*)
os_linux=yes
;;
esac
+
dnl Initialize libtool
AC_PROG_CC
AM_DISABLE_STATIC
AC_ARG_ENABLE(xinerama,
[AC_HELP_STRING([--enable-xinerama],
[support xinerama extension if available [default=yes]])],,
- [enable_xinerama="no"])
+ [enable_xinerama="yes"])
AC_ARG_ENABLE(rebuilds,
[AC_HELP_STRING([--disable-rebuilds],
[disable all source autogeneration rules])],,
fi
# i18n stuff
-# TRANSLATORS: Please note that gtk+ has both po/ and po-properties/
-# directories. If you add a new language to ALL_LINGUAS, please make
-# sure that both po/ and po-properties/ have .po files that correspond
-# to your language. If you only add one to po/, the build will break
-# in po-properties/.
-ALL_LINGUAS="af am ang ar as az az_IR be be@latin bg bn bn_IN br bs ca ca@valencia cs cy da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu hy ia id io is it ja ka kn ko ku li lt lv mi mk ml mn mr ms nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl sq sr sr@Latn sr@ije sv ta te th tk tr tt uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW"
+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
AM_GLIB_GNU_GETTEXT
LIBS="$LIBS $INTLLIBS"
AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
# check one of the variables here
AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
-AC_MSG_CHECKING([if gio can sniff png])
-gtk_save_LIBS="$LIBS"
-gtk_save_CFLAGS="$CFLAGS"
-LIBS="`$PKG_CONFIG --libs gio-2.0`"
-CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <gio/gio.h>
-static const gsize data_size = 159;
-static const guint8 data[] =
-{
- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
- 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
- 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
- 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
- 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
- 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
- 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
- 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
- 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
- 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
- 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
- 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
- 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
- 0x42, 0x60, 0x82
-};
-int
-main (int argc, char **argv)
-{
- char *content_type;
- content_type = g_content_type_guess (NULL, data, data_size, NULL);
- return strcmp (content_type, "image/png");
-}]])],
- [gio_can_sniff=yes
- AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
- [gio_can_sniff=no])
-AC_MSG_RESULT($gio_can_sniff)
-LIBS="$gtk_save_LIBS"
-CFLAGS="$gtk_save_CFLAGS"
+if test x$gio_can_sniff = x; then
+ AC_MSG_CHECKING([if gio can sniff png])
+ gtk_save_LIBS="$LIBS"
+ gtk_save_CFLAGS="$CFLAGS"
+ LIBS="`$PKG_CONFIG --libs gio-2.0`"
+ CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <gio/gio.h>
+ static const gsize data_size = 159;
+ static const guint8 data[] =
+ {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
+ 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
+ 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
+ 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+ 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
+ 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
+ 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
+ 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
+ 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+ 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
+ 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
+ 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
+ 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+ 0x42, 0x60, 0x82
+ };
+ int
+ main (int argc, char **argv)
+ {
+ char *content_type;
+ char *image_png;
+ content_type = g_content_type_guess (NULL, data, data_size, NULL);
+ image_png = g_content_type_for_mime_type ("image/png");
+ return !!strcmp (content_type, image_png);
+ }]])],
+ [gio_can_sniff=yes
+ AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
+ [gio_can_sniff=no])
+ AC_MSG_RESULT($gio_can_sniff)
+ LIBS="$gtk_save_LIBS"
+ CFLAGS="$gtk_save_CFLAGS"
+fi
#
# Allow building some or all immodules included
#define GDK_WINDOWING_X11'
elif test "x$gdktarget" = "xwin32" ; then
gdk_windowing='
+#define GDK_NATIVE_WINDOW_POINTER
+
#define GDK_WINDOWING_WIN32'
elif test "x$gdktarget" = "xquartz" ; then
gdk_windowing='
gdk/win32/rc/gdk.rc
gdk/quartz/Makefile
gdk/directfb/Makefile
+gdk/tests/Makefile
gtk/Makefile
gtk/makefile.msc
gtk/gtkversion.h
projects / ~andy / gtk / blobdiff