# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [91])
-m4_define([gtk_micro_version], [8])
+m4_define([gtk_minor_version], [99])
+m4_define([gtk_micro_version], [3])
m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
[disable all source autogeneration rules])],,
[enable_rebuilds=yes])
+AC_ARG_ENABLE(gtk2-dependency,
+ AC_HELP_STRING([--enable-gtk2-dependency],
+ [Do not build gtk-update-icon-cache and other shared tools]),,
+ [enable_gtk2_dependency=no])
+
+AM_CONDITIONAL(BUILD_ICON_CACHE, [test "x$enable_gtk2_dependency" = xno])
+
AC_ARG_ENABLE(xkb,
[AC_HELP_STRING([--enable-xkb],
[support XKB extension [default=maybe]])],,
[AC_HELP_STRING([--enable-xinput],
[support XInput extension if available [default=yes]])],,
[enable_xinput="maybe"])
+AC_ARG_ENABLE(xrandr,
+ [AC_HELP_STRING([--enable-xrandr],
+ [support XRandR extension if available [default=maybe]])],,
+ [enable_xrandr="maybe"])
+AC_ARG_ENABLE(xfixes,
+ [AC_HELP_STRING([--enable-xfixes],
+ [support XFixes extension if available [default=maybe]])],,
+ [enable_xfixes="maybe"])
+AC_ARG_ENABLE(xcomposite,
+ [AC_HELP_STRING([--enable-xcomposite],
+ [support X Composite extension if available [default=maybe]])],,
+ [enable_xcomposite="maybe"])
+AC_ARG_ENABLE(xdamage,
+ [AC_HELP_STRING([--enable-xdamage],
+ [support X Damage extension if available [default=maybe]])],,
+ [enable_xdamage="maybe"])
AC_ARG_ENABLE(x11-backend,
[AC_HELP_STRING([--enable-x11-backend],
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-if test $cross_compiling = yes; then
+if test "x$cross_compiling" = xyes || test "x$enable_gtk2_dependency" = xyes; then
AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
if test x$GTK_UPDATE_ICON_CACHE = xno; then
REBUILD_PNGS=#
fi
fi
+AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$cross_compiling" = xyes || test "x$enable_gtk2_dependency" = xyes])
+
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
fi
# Check for the RANDR extension
- if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
- AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
-
- X_PACKAGES="$X_PACKAGES xrandr"
- X_EXTENSIONS="$X_EXTENSIONS XRANDR"
+ if test x"$enable_xrandr" != xno; then
+ if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
+ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+
+ X_PACKAGES="$X_PACKAGES xrandr"
+ X_EXTENSIONS="$X_EXTENSIONS XRANDR"
+ elif test x"$enable_xrandr" = xyes; then
+ AC_MSG_ERROR([RANDR support requested but xrandr not found])
+ fi
fi
# Checks for Xcursor library
# Checks for XFixes extension
- if $PKG_CONFIG --exists xfixes ; then
- AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
+ if test x"$enable_xfixes" != xno; then
+ if $PKG_CONFIG --exists xfixes ; then
+ AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
- X_PACKAGES="$X_PACKAGES xfixes"
- X_EXTENSIONS="$X_EXTENSIONS XFIXES"
- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
+ X_PACKAGES="$X_PACKAGES xfixes"
+ X_EXTENSIONS="$X_EXTENSIONS XFIXES"
+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
+ elif test x"$enable_xfixes" = xyes; then
+ AC_MSG_ERROR([XFixes support requested but xfixes not found])
+ fi
fi
# Checks for Xcomposite extension
- if $PKG_CONFIG --exists xcomposite ; then
- AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
+ if test x"$enable_xcomposite" != xno; then
+ if $PKG_CONFIG --exists xcomposite ; then
+ AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
- X_PACKAGES="$X_PACKAGES xcomposite"
- X_EXTENSIONS="$X_EXTENSIONS Composite"
- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite"
+ X_PACKAGES="$X_PACKAGES xcomposite"
+ X_EXTENSIONS="$X_EXTENSIONS Composite"
+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite"
+ elif test x"$enable_xcomposite" = xyes; then
+ AC_MSG_ERROR([Xcomposite support requested but xcomposite not found])
+ fi
fi
# Checks for Xdamage extension
- if $PKG_CONFIG --exists xdamage ; then
- AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension])
+ if test x"$enable_xdamage" != xno; then
+ if $PKG_CONFIG --exists xdamage ; then
+ AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension])
- X_PACKAGES="$X_PACKAGES xdamage"
- X_EXTENSIONS="$X_EXTENSIONS DAMAGE"
- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage"
+ X_PACKAGES="$X_PACKAGES xdamage"
+ X_EXTENSIONS="$X_EXTENSIONS DAMAGE"
+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage"
+ elif test x"$enable_xdamage" = xyes; then
+ AC_MSG_ERROR([Xdamage support requested but xdamage not found])
+ fi
fi
if $have_base_x_pc ; then
# GObject introspection
##################################################
-GOBJECT_INTROSPECTION_CHECK([0.9.3])
+GOBJECT_INTROSPECTION_CHECK([0.10.1])
##################################################
# Packagekit module
G_BEGIN_DECLS
-#ifndef GSEAL
-/* introduce GSEAL() here for all of Gdk and Gtk+ without the need to modify GLib */
-# ifdef GSEAL_ENABLE
-# define GSEAL(ident) _g_sealed__ ## ident
-# else
-# define GSEAL(ident) ident
-# endif
-#endif /* !GSEAL */
-
_______EOF
cat >>$outfile <<_______EOF
docs/reference/gtk/Makefile
docs/reference/gtk/version.xml
docs/reference/libgail-util/Makefile
+docs/reference/libgail-util/version.xml
docs/tools/Makefile
build/Makefile
build/win32/Makefile
gtk/makefile.msc
gtk/gtkversion.h
gtk/gtk-win32.rc
-gtk/theme-bits/Makefile
gtk/tests/Makefile
modules/Makefile
modules/other/Makefile
included_immodules=${included_immodules//,/ }
included_immodules=${included_immodules:-none}
-echo "configuration:"
+echo ""
+echo " GTK+ $GTK_VERSION"
+echo " ==========="
+echo ""
echo " GDK backends: $GDK_BACKENDS"
if test "x$enable_x11_backend" = "xyes"; then
echo " X11 extensions: $X_EXTENSIONS"
projects / ~andy / gtk / blobdiff