X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.ac;h=1b13ba39424ef6b55cea935d505d3657c31581a7;hb=c3955ea0c251fea0141759719ddd46821ca5d0d7;hp=7be4641320793c16d2e5833a421fb82bdeadb0a2;hpb=e60eff282aaa6b0e3f79876e8414911a5b34c6cf;p=~andy%2Fgtk diff --git a/configure.ac b/configure.ac index 7be464132..1b13ba394 100644 --- a/configure.ac +++ b/configure.ac @@ -9,8 +9,8 @@ # 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)]) @@ -236,36 +236,140 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@], [turn on debugging @<:@default=debug_default@:>@]),, enable_debug=debug_default) + +AC_ARG_ENABLE(rebuilds, + [AC_HELP_STRING([--disable-rebuilds], + [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 [default=maybe]])],, + [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"]) -AC_ARG_ENABLE(rebuilds, - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, - [enable_rebuilds=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="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], + [enable the X11 gdk backend])], + [backend_set=yes]) +AC_ARG_ENABLE(win32-backend, + [AC_HELP_STRING([--enable-win32-backend], + [enable the Win32 gdk backend])], + [backend_set=yes]) +AC_ARG_ENABLE(quartz-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 + enable_win32_backend=yes + else + enable_x11_backend=yes + fi +fi -AC_ARG_WITH(xinput, - [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])]) +cairo_backends= +backend_immodules= +GDK_BACKENDS= +GDK_EXTRA_LIBS= +GDK_EXTRA_CFLAGS= +GDK_WINDOWING= +GIO_PACKAGE=gio-2.0 +PANGO_PACKAGES="pango pangocairo" + +if test "x$enable_x11_backend" == xyes; then + # GDK calls the xlib backend "x11," cairo calls it "xlib." Other + # backend names are identical. + cairo_backends="$cairo_backends cairo-xlib" + GDK_BACKENDS="$GDK_BACKENDS x11" + # Pull in gio-unix for GDesktopAppInfo usage, see at least + # gdkapplaunchcontext-x11.c + GIO_PACKAGE=gio-unix-2.0 + backend_immodules="$backend_immodules,xim" + GDK_WINDOWING="$GDK_WINDOWING +#define GDK_WINDOWING_X11" +fi -if test "$platform_win32" = yes; then - gdktarget=win32 +if test "x$enable_win32_backend" == xyes; then + cairo_backends="$cairo_backends cairo-win32" + GDK_BACKENDS="$GDK_BACKENDS win32" + backend_immodules="$backend_immodules,ime" + GDK_WINDOWING="$GDK_WINDOWING +#define GDK_WINDOWING_WIN32" + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" + AM_CONDITIONAL(USE_WIN32, true) + PANGO_PACKAGES="pangowin32 pangocairo" else - gdktarget=x11 + AM_CONDITIONAL(USE_WIN32, false) fi -AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz]] select non-default GDK target], - gdktarget=$with_gdktarget) +if test "x$enable_quartz_backend" == xyes; then + cairo_backends="$cairo_backends cairo-quartz" + GDK_BACKENDS="$GDK_BACKENDS quartz" + GDK_WINDOWING="$GDK_WINDOWING +#define GDK_WINDOWING_QUARTZ" + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" + AM_CONDITIONAL(USE_QUARTZ, true) +else + AM_CONDITIONAL(USE_QUARTZ, false) +fi -AC_SUBST(gdktarget) -case $gdktarget in - x11|win32|quartz) ;; - *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz or win32.]);; -esac +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) + +if test -z "$GDK_BACKENDS"; then + AC_MSG_ERROR([No GDK backends selected.]) +fi if test "x$enable_debug" = "xyes"; then test "$cflags_set" = set || CFLAGS="$CFLAGS -g" @@ -358,18 +462,7 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES, 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 -## check that the correct cairo backend is there. E.g. if the GDK -## target is win32 we need the cairo-win32 backend and so on. -cairo_backend=$gdktarget - -# GDK calls the xlib backend "x11," cairo calls it "xlib." Other -# backend names are identical. -if test "x$cairo_backend" = "xx11"; then - cairo_backend=xlib -fi -PKG_CHECK_MODULES(CAIRO_BACKEND, - [cairo-$cairo_backend >= cairo_required_version]) +PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends]) if test "$os_win32" != yes; then # libtool option to control which symbols are exported @@ -679,6 +772,7 @@ AC_ARG_ENABLE(modules, [disable dynamic module loading])]) dynworks=false +build_dynamic_modules=no deps= if test x$enable_modules = xno; then AC_MSG_RESULT(no) @@ -706,10 +800,12 @@ else 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 @@ -726,8 +822,8 @@ dnl AC_HELP_STRING cause problems. dnl AC_HELP_STRING([--with-included-immodules=MODULE1 MODULE2 ...], dnl [build the specified input method modules into gtk]) AC_ARG_WITH(included_immodules, -[ --with-included-immodules=MODULE1,MODULE2,... - build the specified input methods into gtk]) + AC_HELP_STRING([--with-included-immodules=MODULE1,MODULE2,...], + [build the specified input methods into gtk])) if $dynworks; then : @@ -738,14 +834,7 @@ else fi fi -all_immodules="am-et,cedilla,cyrillic-translit" -if test "$gdktarget" = "win32"; then - all_immodules="${all_immodules},ime" -fi -all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr" -if test "$gdktarget" = "x11"; then - all_immodules="${all_immodules},xim" -fi +all_immodules="am-et,cedilla,cyrillic-translit,inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr$backend_immodules" included_immodules="" # If the switch specified without listing any specific ones, include all @@ -809,13 +898,15 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling 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 && @@ -830,14 +921,12 @@ fi # Windowing system checks ######################################## -GDK_EXTRA_LIBS= -GDK_EXTRA_CFLAGS= - # 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$gdktarget" = "xx11"; then +if test "x$enable_x11_backend" == xyes; then X_PACKAGES=fontconfig # @@ -935,10 +1024,13 @@ if test "x$gdktarget" = "xx11"; then # 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) @@ -960,19 +1052,23 @@ if test "x$gdktarget" = "xx11"; then 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) @@ -981,14 +1077,12 @@ if test "x$gdktarget" = "xx11"; then 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 @@ -1001,6 +1095,7 @@ if test "x$gdktarget" = "xx11"; then [#include ])]) 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, @@ -1015,9 +1110,14 @@ if test "x$gdktarget" = "xx11"; then 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$with_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then + if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then have_xinput=yes AC_DEFINE(XINPUT_XFREE, 1, @@ -1026,7 +1126,11 @@ if test "x$gdktarget" = "xx11"; 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]) @@ -1035,11 +1139,22 @@ if test "x$gdktarget" = "xx11"; then 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 @@ -1052,29 +1167,44 @@ if test "x$gdktarget" = "xx11"; then # 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 @@ -1087,6 +1217,10 @@ if test "x$gdktarget" = "xx11"; then LIBS="$gtk_save_libs" AM_CONDITIONAL(USE_X11, true) + + # strip leading space + X_EXTENSIONS=${X_EXTENSIONS/# } + else XPACKAGES= @@ -1096,28 +1230,8 @@ else AM_CONDITIONAL(HAVE_X11R6, false) fi -if test "x$gdktarget" = "xwin32"; then - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" - AM_CONDITIONAL(USE_WIN32, true) -else - AM_CONDITIONAL(USE_WIN32, false) -fi - -if test "x$gdktarget" = "xquartz"; then - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" - AM_CONDITIONAL(USE_QUARTZ, true) -else - AM_CONDITIONAL(USE_QUARTZ, false) -fi - # Check for Pango flags -if test "x$gdktarget" = "xwin32"; then - PANGO_PACKAGES="pangowin32 pangocairo" -else - PANGO_PACKAGES="pango pangocairo" -fi - AC_MSG_CHECKING(Pango flags) if $PKG_CONFIG --exists $PANGO_PACKAGES ; then PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` @@ -1147,12 +1261,7 @@ fi CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" -# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c -if test "x$gdktarget" = "xx11"; then - GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend cairo-gobject" -else - GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend cairo-gobject" -fi +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" @@ -1161,7 +1270,7 @@ GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFL # 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 @@ -1202,7 +1311,7 @@ else fi GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0" -if test "x$gdktarget" = "xx11"; then +if test "x$enable_x11_backend" == xyes; then GTK_PACKAGES="$GTK_PACKAGES pangoft2" fi GTK_EXTRA_LIBS= @@ -1271,8 +1380,10 @@ LIBS="$old_LIBS" # Printing system checks ################################################################ +PRINT_BACKENDS="file lpr" + AC_ARG_ENABLE(cups, - [AC_HELP_STRING([--disable-cups] + [AC_HELP_STRING([--disable-cups], [disable cups print backend])],, [enable_cups=auto]) @@ -1309,6 +1420,7 @@ else 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" @@ -1332,7 +1444,7 @@ fi # AC_ARG_ENABLE(papi, - [AC_HELP_STRING([--disable-papi] + [AC_HELP_STRING([--disable-papi], [disable papi print backend])],, [enable_papi=auto]) @@ -1342,6 +1454,7 @@ else 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) @@ -1367,7 +1480,7 @@ if test "$os_win32" != "yes"; then *** postscript backend enabled.])) AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([ -*** Can't find cairo-svg.h. You must build Cairo with the +*** Cannot find cairo-svg.h. You must build Cairo with the *** svg backend enabled.])) fi @@ -1378,6 +1491,9 @@ AC_ARG_ENABLE(test-print-backend, [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") @@ -1411,26 +1527,25 @@ GLIB_GSETTINGS # GObject introspection ################################################## -GOBJECT_INTROSPECTION_CHECK([0.9.3]) +GOBJECT_INTROSPECTION_CHECK([0.10.1]) ################################################## # Packagekit module ################################################# AC_ARG_ENABLE(packagekit, - AC_HELP_STRING([--disable-packagekit], - [build packagekit open with 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 - AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit]) - fi + if test "x$enable_packagekit" != "xno"; then + 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 @@ -1488,15 +1603,6 @@ AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [ 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 @@ -1518,20 +1624,7 @@ _______EOF mv $outfile gdk/gdkconfig.h fi ],[ -gdk_windowing='' -if expr "$gdktarget" : ".*x11.*" > /dev/null ; then - gdk_windowing+=' -#define GDK_WINDOWING_X11' -fi -if expr "$gdktarget" : ".*win32.*" > /dev/null ; then - gdk_windowing+=' -#define GDK_NATIVE_WINDOW_POINTER -#define GDK_WINDOWING_WIN32' -fi -if expr "$gdktarget" : ".*quartz.*" > /dev/null ; then - gdk_windowing=' -#define GDK_WINDOWING_QUARTZ' -fi +gdk_windowing='$GDK_WINDOWING' ]) dnl @@ -1551,7 +1644,7 @@ AC_ARG_ENABLE(Bsymbolic, enable_Bsymbolic=no) LDFLAGS="${SAVED_LDFLAGS}"]) -if test "x${enable_Bsymbolic}" == "xyes"; then +if test "x${enable_Bsymbolic}" = "xyes" ; then GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions fi AC_SUBST(GTK_LINK_FLAGS) @@ -1581,6 +1674,7 @@ docs/reference/gdk/version.xml 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 @@ -1591,12 +1685,12 @@ gdk/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 @@ -1620,5 +1714,22 @@ perf/Makefile AC_OUTPUT -echo "configuration: - target: $gdktarget" +# 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"