# 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], [4])
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]])],,
[enable_xkb="maybe"])
AC_ARG_ENABLE(xinerama,
[AC_HELP_STRING([--enable-xinerama],
- [support Xinerama extension if available [default=yes]])],,
- [enable_xinerama="yes"])
+ [support Xinerama extension if available [default=maybe]])],,
+ [enable_xinerama="maybe"])
AC_ARG_ENABLE(xinput,
[AC_HELP_STRING([--enable-xinput],
[support XInput extension if available [default=yes]])],,
- [enable_xinput="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],
[AC_HELP_STRING([--enable-quartz-backend],
[enable the quartz gdk backend])],
[backend_set=yes])
+AC_ARG_ENABLE(wayland-backend,
+ [AC_HELP_STRING([--enable-wayland-backend],
+ [enable the wayland gdk backend])],
+ [backend_set=yes])
if test -z "$backend_set"; then
if test "$platform_win32" = yes; then
GDK_BACKENDS="$GDK_BACKENDS win32"
backend_immodules="$backend_immodules,ime"
GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_NATIVE_WINDOW_POINTER
#define GDK_WINDOWING_WIN32"
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
AM_CONDITIONAL(USE_WIN32, true)
AM_CONDITIONAL(USE_QUARTZ, false)
fi
+if test "x$enable_wayland_backend" == "xyes"; then
+ # Wayland uses cairo-gl
+ cairo_backends="$cairo_backends cairo-gl"
+ GDK_BACKENDS="$GDK_BACKENDS wayland"
+ GIO_PACKAGE=gio-unix-2.0
+ GDK_WINDOWING="$GDK_WINDOWING
+#define GDK_WINDOWING_WAYLAND"
+ WAYLAND_PACKAGES="wayland-client xkbcommon wayland-egl"
+ AM_CONDITIONAL(USE_WAYLAND, true)
+else
+ AM_CONDITIONAL(USE_WAYLAND, false)
+fi
+
+# strip leading space
+GDK_BACKENDS=${GDK_BACKENDS/# }
AC_SUBST(GDK_BACKENDS)
[disable dynamic module loading])])
dynworks=false
+build_dynamic_modules=no
deps=
if test x$enable_modules = xno; then
AC_MSG_RESULT(no)
fi
if $dynworks; then
+ build_dynamic_modules=yes
AC_DEFINE(USE_GMODULE, 1,
[Define to 1 if gmodule works and should be used])
AC_MSG_RESULT(yes)
else
+ build_dynamic_modules=no
AC_MSG_RESULT(no)
fi
fi
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 &&
# GTK+ uses some X calls, so needs to link against X directly
GTK_DEP_PACKAGES_FOR_X=
GTK_DEP_LIBS_FOR_X=
+X_EXTENSIONS=
if test "x$enable_x11_backend" == xyes; then
X_PACKAGES=fontconfig
# Check for XKB support.
if test "x$enable_xkb" = "xyes"; then
- AC_MSG_WARN(XKB support explicitly enabled)
- AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension])
+ AC_CHECK_FUNC(XkbQueryExtension,
+ X_EXTENSIONS="$X_EXTENSIONS XKB"
+ AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]),
+ AC_MSG_ERROR([*** XKB extension not found. Check 'config.log' for more details.]))
elif test "x$enable_xkb" = "xmaybe"; then
AC_CHECK_FUNC(XkbQueryExtension,
+ X_EXTENSIONS="$X_EXTENSIONS XKB"
AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]))
else
AC_MSG_WARN(XKB support explicitly disabled)
CFLAGS="$gtk_save_CFLAGS"
- if test "x$enable_xinerama" = "xyes"; then
+ if test "x$enable_xinerama" != "xno"; then
# Check for Xinerama extension (Solaris impl or Xfree impl)
+ have_xfree_xinerama=false
+ have_solaris_xinerama=false
+
gtk_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $x_cflags"
# Check for XFree
- AC_MSG_CHECKING(for Xinerama support on XFree86)
+ AC_MSG_CHECKING(for Xinerama packages)
- have_xfree_xinerama=false
if $PKG_CONFIG --exists xinerama ; then
+ AC_MSG_RESULT(yes)
have_xfree_xinerama=true
X_PACKAGES="$X_PACKAGES xinerama"
else
+ AC_MSG_RESULT(no)
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
[AC_CHECK_HEADER(X11/extensions/Xinerama.h,
[GTK_ADD_LIB(x_extra_libs,Xinerama)
fi
if $have_xfree_xinerama ; then
+ X_EXTENSIONS="$X_EXTENSIONS Xinerama"
AC_DEFINE(HAVE_XFREE_XINERAMA, 1,
[Define to 1 if XFree Xinerama is available])
AC_DEFINE(HAVE_XINERAMA, 1,
[Define to 1 is Xinerama is available])
- AC_MSG_RESULT(yes)
else
- AC_MSG_RESULT(no)
-
case "$host" in
*-*-solaris*)
# Check for solaris
[#include <X11/Xlib.h>])])
if $have_solaris_xinerama ; then
+ X_EXTENSIONS="$X_EXTENSIONS Xinerama"
AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
[Define to 1 if solaris xinerama is available])
AC_DEFINE(HAVE_XINERAMA, 1,
esac
fi
fi
+ if test "x$enable_xinerama" = "xyes" ; then
+ if test "x$have_xfree_xinerama" != "xtrue" -a "x$have_solaris_xinerama" != "xtrue" ; then
+ AC_MSG_ERROR([*** Xinerama extension not found. Check 'config.log' for more details.])
+ fi
+ fi
# set up things for XInput
if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
X_PACKAGES="$X_PACKAGES xi"
AC_CHECK_HEADER(X11/extensions/XInput2.h,
- have_xinput2=yes; AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]))
+ 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])
AM_CONDITIONAL(XINPUT_XFREE, test "x$have_xinput" = "xyes")
AM_CONDITIONAL(XINPUT_2, test "x$have_xinput2" = "xyes")
- # Check for the RANDR extension
- if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
- AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+ 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.])
+ fi
+ fi
- X_PACKAGES="$X_PACKAGES xrandr"
+ # Check for the RANDR extension
+ 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"
- 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"
- 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"
- 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
LIBS="$gtk_save_libs"
AM_CONDITIONAL(USE_X11, true)
+
+ # strip leading space
+ X_EXTENSIONS=${X_EXTENSIONS/# }
+
else
XPACKAGES=
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
-GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"
+GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"
GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
# into the pkg-config files
#
if test $enable_explicit_deps != yes ; then
- GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
+ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo-gobject"
GDK_EXTRA_LIBS=
fi
# Printing system checks
################################################################
+PRINT_BACKENDS="file lpr"
+
AC_ARG_ENABLE(cups,
[AC_HELP_STRING([--disable-cups],
[disable cups print backend])],,
AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
+ PRINT_BACKENDS="$PRINT_BACKENDS cups"
AM_CONDITIONAL(HAVE_CUPS, true)
gtk_save_cflags="$CFLAGS"
AC_MSG_CHECKING(libpapi)
AC_CHECK_LIB(papi, papiServiceCreate, have_papi=yes, have_papi=no)
if test $have_papi = yes; then
+ PRINT_BACKENDS="$PRINT_BACKENDS papi"
AC_DEFINE([HAVE_PAPI], [], [Define to 1 if libpapi available])
fi
AM_CONDITIONAL(HAVE_PAPI, test $have_papi = yes)
[AC_HELP_STRING([--enable-test-print-backend],
[build test print backend])],,
[enable_test_print_backend=no])
+if test "x$enable_test_print_backend" != "xno" ; then
+ PRINT_BACKENDS="$PRINT_BACKENDS test"
+fi
AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
# GObject introspection
##################################################
-GOBJECT_INTROSPECTION_CHECK([0.9.3])
+GOBJECT_INTROSPECTION_CHECK([0.10.1])
##################################################
# Packagekit module
AC_HELP_STRING([--disable-packagekit],
[build packagekit open-with module]))
-ENABLE_PACKAGEKIT=
+build_packagekit=no
if test "os_win32" != "yes"; then
if test "x$enable_packagekit" != "xno"; then
- ENABLE_PACKAGEKIT=1
+ build_packagekit=yes
AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit])
fi
fi
-AC_SUBST(ENABLE_PACKAGEKIT)
-AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$ENABLE_PACKAGEKIT" = "x1")
+AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$build_packagekit" = "xyes")
##################################################
# Checks for gtk-doc and docbook-tools
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
gdk/win32/rc/Makefile
gdk/win32/rc/gdk.rc
gdk/quartz/Makefile
+gdk/wayland/Makefile
gdk/tests/Makefile
gtk/Makefile
gtk/makefile.msc
gtk/gtkversion.h
gtk/gtk-win32.rc
-gtk/theme-bits/Makefile
gtk/tests/Makefile
modules/Makefile
modules/other/Makefile
AC_OUTPUT
-echo "configuration:
- backends: $GDK_BACKENDS"
+# beautify the immodule list a bit
+included_immodules=${included_immodules//,/ }
+included_immodules=${included_immodules:-none}
+
+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"
+fi
+echo " Print backends: $PRINT_BACKENDS"
+echo " Dynamic modules: $build_dynamic_modules"
+echo " Included immodules: $included_immodules"
+echo " PackageKit support: $build_packagekit"
+echo " Introspection: $found_introspection"
+echo " Debugging: $enable_debug"
+echo " Documentation: $enable_gtk_doc"
projects / ~andy / gtk / blobdiff