X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.ac;h=6ced37a9450bb6de27dcc143aee10c932fa036b9;hb=68e943506e411b0accce1fd0b6fa6eece23c4ac8;hp=8eb01b07ae6a9ef451c6e2d34a79d92b209a29b9;hpb=ec15c405cf6354e9267e7e6b7ce878c519bffe4c;p=~andy%2Fgtk diff --git a/configure.ac b/configure.ac index 8eb01b07a..6ced37a94 100644 --- a/configure.ac +++ b/configure.ac @@ -8,9 +8,9 @@ # if backwards compatibility has been broken, # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0. -m4_define([gtk_major_version], [2]) -m4_define([gtk_minor_version], [99]) -m4_define([gtk_micro_version], [1]) +m4_define([gtk_major_version], [3]) +m4_define([gtk_minor_version], [1]) +m4_define([gtk_micro_version], [91]) m4_define([gtk_interface_age], [0]) m4_define([gtk_binary_age], [m4_eval(100 * gtk_minor_version + gtk_micro_version)]) @@ -27,6 +27,7 @@ AC_INIT([gtk+], [gtk_version], AC_CONFIG_HEADER([config.h]) AC_CONFIG_SRCDIR([gdk/gdktypes.h]) AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([build-aux]) # Define a string for the earliest version that this release has # backwards binary compatibility with for all interfaces a module @@ -38,33 +39,36 @@ AC_CONFIG_MACRO_DIR([m4]) m4_define([gtk_binary_version], [3.0.0]) # required versions of other packages -m4_define([glib_required_version], [2.27.5]) -m4_define([pango_required_version], [1.20]) -m4_define([atk_required_version], [1.29.2]) +m4_define([glib_required_version], [2.29.14]) +m4_define([pango_required_version], [1.29.0]) +m4_define([atk_required_version], [2.1.5]) m4_define([cairo_required_version], [1.10.0]) -m4_define([gdk_pixbuf_required_version], [2.21.0]) +m4_define([gdk_pixbuf_required_version], [2.23.5]) +m4_define([introspection_required_version], [0.10.1]) 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 +INTROSPECTION_REQUIRED_VERSION=introspection_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_SUBST(INTROSPECTION_REQUIRED_VERSION) # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} -AM_INIT_AUTOMAKE([1.10 no-define -Wno-portability dist-bzip2]) +AM_INIT_AUTOMAKE([1.11 -Wall no-define -Wno-portability tar-ustar no-dist-gzip dist-xz]) AM_MAINTAINER_MODE([enable]) -# Support silent build rules, requires at least automake-1.11. Disable +# Support silent build rules. Disable # by either passing --disable-silent-rules to configure or passing V=1 # to make -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AM_SILENT_RULES([yes]) # # For each of the libraries we build, we define the following @@ -161,6 +165,9 @@ case $host in *-*-linux*) os_linux=yes ;; + *-*-openbsd*) + os_openbsd=yes + ;; esac dnl @@ -170,12 +177,16 @@ dnl AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc) AC_LANG_PUSH([C++]) -AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], + [[class a { int b; } c;]])], + [],[CXX=]) AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "") gtk_save_cxxflags="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -x objective-c++" -AC_TRY_COMPILE([@interface Foo @end],,OBJC=yes,OBJC=no) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@interface Foo @end]], + [[]])], + [OBJC=yes],[OBJC=no]) AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes") CXXFLAGS="$gtk_save_cxxflags" AC_LANG_POP([C++]) @@ -233,56 +244,71 @@ m4_define([debug_default], dnl declare --enable-* args and collect ac_help strings AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@], - [turn on debugging @<:@default=debug_default@:>@]),, - enable_debug=debug_default) + [AS_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], + [AS_HELP_STRING([--disable-rebuilds], [disable all source autogeneration rules])],, [enable_rebuilds=yes]) +AC_ARG_ENABLE(gtk2-dependency, + [AS_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], + [AS_HELP_STRING([--enable-xkb], [support XKB extension [default=maybe]])],, [enable_xkb="maybe"]) AC_ARG_ENABLE(xinerama, - [AC_HELP_STRING([--enable-xinerama], + [AS_HELP_STRING([--enable-xinerama], [support Xinerama extension if available [default=maybe]])],, [enable_xinerama="maybe"]) AC_ARG_ENABLE(xinput, - [AC_HELP_STRING([--enable-xinput], + [AS_HELP_STRING([--enable-xinput], [support XInput extension if available [default=yes]])],, [enable_xinput="maybe"]) AC_ARG_ENABLE(xrandr, - [AC_HELP_STRING([--enable-xrandr], + [AS_HELP_STRING([--enable-xrandr], [support XRandR extension if available [default=maybe]])],, [enable_xrandr="maybe"]) AC_ARG_ENABLE(xfixes, - [AC_HELP_STRING([--enable-xfixes], + [AS_HELP_STRING([--enable-xfixes], [support XFixes extension if available [default=maybe]])],, [enable_xfixes="maybe"]) AC_ARG_ENABLE(xcomposite, - [AC_HELP_STRING([--enable-xcomposite], + [AS_HELP_STRING([--enable-xcomposite], [support X Composite extension if available [default=maybe]])],, [enable_xcomposite="maybe"]) AC_ARG_ENABLE(xdamage, - [AC_HELP_STRING([--enable-xdamage], + [AS_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], + [AS_HELP_STRING([--enable-x11-backend], [enable the X11 gdk backend])], [backend_set=yes]) AC_ARG_ENABLE(win32-backend, - [AC_HELP_STRING([--enable-win32-backend], + [AS_HELP_STRING([--enable-win32-backend], [enable the Win32 gdk backend])], [backend_set=yes]) AC_ARG_ENABLE(quartz-backend, - [AC_HELP_STRING([--enable-quartz-backend], + [AS_HELP_STRING([--enable-quartz-backend], [enable the quartz gdk backend])], [backend_set=yes]) +AC_ARG_ENABLE(broadway-backend, + [AS_HELP_STRING([--enable-broadway-backend], + [enable the broadway (HTML5) gdk backend])], + [backend_set=yes]) +AC_ARG_ENABLE(wayland-backend, + [AS_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 @@ -301,7 +327,7 @@ GDK_WINDOWING= GIO_PACKAGE=gio-2.0 PANGO_PACKAGES="pango pangocairo" -if test "x$enable_x11_backend" == xyes; then +if test "$enable_x11_backend" = "yes"; then # GDK calls the xlib backend "x11," cairo calls it "xlib." Other # backend names are identical. cairo_backends="$cairo_backends cairo-xlib" @@ -314,12 +340,11 @@ if test "x$enable_x11_backend" == xyes; then #define GDK_WINDOWING_X11" fi -if test "x$enable_win32_backend" == xyes; then +if test "$enable_win32_backend" = "yes"; then cairo_backends="$cairo_backends cairo-win32" 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) @@ -328,7 +353,7 @@ else AM_CONDITIONAL(USE_WIN32, false) fi -if test "x$enable_quartz_backend" == xyes; then +if test "x$enable_quartz_backend" = xyes; then cairo_backends="$cairo_backends cairo-quartz" GDK_BACKENDS="$GDK_BACKENDS quartz" GDK_WINDOWING="$GDK_WINDOWING @@ -339,8 +364,33 @@ else AM_CONDITIONAL(USE_QUARTZ, false) fi + +if test "x$enable_broadway_backend" == xyes; then + GDK_BACKENDS="$GDK_BACKENDS broadway" + cairo_backends="$cairo_backends cairo" + GDK_WINDOWING="$GDK_WINDOWING +#define GDK_WINDOWING_BROADWAY" + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz" + AM_CONDITIONAL(USE_BROADWAY, true) +else + AM_CONDITIONAL(USE_BROADWAY, 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 egl" + AM_CONDITIONAL(USE_WAYLAND, true) +else + AM_CONDITIONAL(USE_WAYLAND, false) +fi + # strip leading space -GDK_BACKENDS=${GDK_BACKENDS/# } +GDK_BACKENDS=${GDK_BACKENDS#* } AC_SUBST(GDK_BACKENDS) @@ -456,7 +506,7 @@ dnl * See whether to include shared library dependencies * dnl ****************************************************** AC_ARG_ENABLE(explicit-deps, - [AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@], + [AS_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@], [use explicit dependencies in .pc files [default=auto]])],, [enable_explicit_deps=auto]) @@ -465,7 +515,7 @@ case $enable_explicit_deps in auto) export SED deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then + if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then enable_explicit_deps=yes else enable_explicit_deps=no @@ -501,10 +551,10 @@ AC_CHECK_FUNCS(localtime_r) # _NL_TIME_FIRST_WEEKDAY is an enum and not a define AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY]) -AC_TRY_LINK([#include ], [ -char c; -c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY)); -], gtk_ok=yes, gtk_ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[char c; + c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY));]])], + [gtk_ok=yes], [gtk_ok=no]) AC_MSG_RESULT($gtk_ok) if test "$gtk_ok" = "yes"; then AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1], @@ -513,10 +563,10 @@ fi # _NL_MEASUREMENT_MEASUREMENT is an enum and not a define AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT]) -AC_TRY_LINK([#include ], [ -char c; -c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT)); -], gtk_ok=yes, gtk_ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[char c; + c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));]])], + [gtk_ok=yes], [gtk_ok=no]) AC_MSG_RESULT($gtk_ok) if test "$gtk_ok" = "yes"; then AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1], @@ -525,10 +575,10 @@ fi # _NL_PAPER_HEIGHT is an enum and not a define AC_MSG_CHECKING([for _NL_PAPER_HEIGHT]) -AC_TRY_LINK([#include ], [ -char c; -c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT)); -], gtk_ok=yes, gtk_ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[char c; + c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT));]])], + [gtk_ok=yes], [gtk_ok=no]) AC_MSG_RESULT($gtk_ok) if test "$gtk_ok" = "yes"; then AC_DEFINE([HAVE__NL_PAPER_HEIGHT], [1], @@ -537,10 +587,10 @@ fi # _NL_PAPER_WIDTH is an enum and not a define AC_MSG_CHECKING([for _NL_PAPER_WIDTH]) -AC_TRY_LINK([#include ], [ -char c; -c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH)); -], gtk_ok=yes, gtk_ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[char c; + c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH));]])], + [gtk_ok=yes], [gtk_ok=no]) AC_MSG_RESULT($gtk_ok) if test "$gtk_ok" = "yes"; then AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1], @@ -551,9 +601,11 @@ fi 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*) - sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile - esac]) +AC_CONFIG_COMMANDS([po-properties], + [[case "$CONFIG_FILES" in *po-properties/Makefile.in*) + sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile + esac]], + [[]]) dnl Snippet below is copied from AM_GLIB_GNU_GETTEXT to generate a first dnl po-properties/POTFILES during configure; see GNOME #573515. @@ -583,22 +635,20 @@ AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) gtk_save_LIBS=$LIBS LIBS="$LIBS -lm" -AC_TRY_RUN([#include - int main (void) { return (log(1) != log(1.)); }], - AC_MSG_RESULT(none needed), - gtk_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -std1" - AC_TRY_RUN([#include - int main (void) { return (log(1) != log(1.)); }], - AC_MSG_RESULT(-std1), - AC_MSG_RESULT() - CFLAGS="$gtk_save_CFLAGS" - AC_MSG_WARN( - [No ANSI prototypes found in library. (-std1 didn't work.)]), - true - ), - AC_MSG_RESULT(none needed) -) +AC_RUN_IFELSE([AC_LANG_SOURCE([[#include + int main (void) { return (log(1) != log(1.)); }]])], + [AC_MSG_RESULT(none needed)], + [gtk_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -std1" + AC_RUN_IFELSE([AC_LANG_SOURCE([[#include + int main (void) { return (log(1) != log(1.)); }]])], + [AC_MSG_RESULT(-std1)], + [AC_MSG_RESULT() + CFLAGS="$gtk_save_CFLAGS" + AC_MSG_WARN([No ANSI prototypes found in library. (-std1 did not work.)])], + [true])], + [AC_MSG_RESULT(none needed)]) + LIBS=$gtk_save_LIBS AC_MSG_CHECKING(for the BeOS) @@ -627,18 +677,6 @@ case $host_os in ;; esac -dnl NeXTStep cc seems to need this -AC_MSG_CHECKING([for extra flags for POSIX compliance]) -AC_TRY_COMPILE([#include ], [DIR *dir;], - AC_MSG_RESULT(none needed), - gtk_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -posix" - AC_TRY_COMPILE([#include ], [DIR *dir;], - AC_MSG_RESULT(-posix), - AC_MSG_RESULT() - CFLAGS="$gtk_save_CFLAGS" - AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)]))) - # # Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working # @@ -683,9 +721,11 @@ AC_CHECK_HEADERS(ftw.h, [Define to 1 if ftw.h is available])) AC_MSG_CHECKING([for GNU ftw extensions]) -AC_TRY_COMPILE([#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE -#include ], [int flags = FTW_ACTIONRETVAL;], gtk_ok=yes, gtk_ok=no) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500 + #define _GNU_SOURCE + #include ]], + [[int flags = FTW_ACTIONRETVAL;]])], + [gtk_ok=yes],[gtk_ok=no]) if test $gtk_ok = yes; then AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_GNU_FTW, 1, [Have GNU ftw]) @@ -697,47 +737,34 @@ saved_cflags="$CFLAGS" saved_ldflags="$LDFLAGS" -# Checks for header files. -AC_HEADER_STDC - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST - # Checks for library functions. -AC_TYPE_SIGNAL AC_FUNC_MMAP AC_CHECK_FUNCS(mallinfo) AC_CHECK_FUNCS(getresuid) AC_TYPE_UID_T -# Check if needs to be included for fd_set -AC_MSG_CHECKING([for fd_set]) -AC_TRY_COMPILE([#include ], - [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no) -if test $gtk_ok = yes; then - AC_MSG_RESULT([yes, found in sys/types.h]) -else - AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes) - if test $gtk_ok = yes; then - AC_DEFINE(HAVE_SYS_SELECT_H, 1, - [Define to 1 if sys/select.h is available]) - AC_MSG_RESULT([yes, found in sys/select.h]) - else - AC_DEFINE(NO_FD_SET, 1, - [Define to 1 if fd_set is not available]) - AC_MSG_RESULT(no) - fi -fi - # Check for uxtheme.h (for MS-Windows Engine) AC_MSG_CHECKING(for uxtheme.h) -AC_TRY_CPP([#include ], gtk_uxtheme_h=yes, gtk_uxtheme_h=no) +AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include ]])], + [gtk_uxtheme_h=yes], [gtk_uxtheme_h=no]) if test $gtk_uxtheme_h = yes; then AC_DEFINE(HAVE_UXTHEME_H, 1, [Have uxtheme.h include file]) fi AC_MSG_RESULT($gtk_uxtheme_h) +# Check for round() +AC_CHECK_LIB(m,round,have_round=yes,have_round=no) +if test $have_round = yes; then + AC_DEFINE(HAVE_ROUND, 1, [Define to 1 if round() is available]) +fi + +# Check for rint() +AC_CHECK_LIB(m,rint,have_rint=yes,have_rint=no) +if test $have_rint = yes; then + AC_DEFINE(HAVE_RINT, 1, [Define to 1 if rint() is available]) +fi + # Checks for gdkspawn AC_CHECK_HEADERS(crt_externs.h) AC_CHECK_FUNCS(_NSGetEnviron) @@ -745,7 +772,7 @@ AC_CHECK_FUNCS(_NSGetEnviron) AC_MSG_CHECKING(whether to build dynamic modules) AC_ARG_ENABLE(modules, - [AC_HELP_STRING([--disable-modules], + [AS_HELP_STRING([--disable-modules], [disable dynamic module loading])]) dynworks=false @@ -794,13 +821,9 @@ AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks) # AC_MSG_CHECKING(immodules to build) -dnl due to an autoconf bug, commas in the first arg to -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, - AC_HELP_STRING([--with-included-immodules=MODULE1,MODULE2,...], - [build the specified input methods into gtk])) + [AS_HELP_STRING([--with-included-immodules=MODULE1,MODULE2,...], + [build the specified input methods into gtk])]) if $dynworks; then : @@ -857,10 +880,6 @@ AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes]) AM_CONDITIONAL(INCLUDE_IM_VIQR, [test x"$INCLUDE_viqr" = xyes]) AM_CONDITIONAL(INCLUDE_IM_XIM, [test x"$INCLUDE_xim" = xyes]) -AC_HEADER_SYS_WAIT - -AC_TYPE_SIGNAL - # Checks to see whether we should include mediaLib # support. # @@ -875,13 +894,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 && @@ -901,7 +922,7 @@ GTK_DEP_PACKAGES_FOR_X= GTK_DEP_LIBS_FOR_X= X_EXTENSIONS= -if test "x$enable_x11_backend" == xyes; then +if test "x$enable_x11_backend" = xyes; then X_PACKAGES=fontconfig # @@ -966,17 +987,17 @@ if test "x$enable_x11_backend" == xyes; then # Check for xReply AC_MSG_CHECKING([if is needed for xReply]) - AC_TRY_COMPILE([#include ], - [xReply *rep;], - [AC_MSG_RESULT([no])], - [AC_TRY_COMPILE([#include -#include ], - [xReply *rep;], - [AC_MSG_RESULT([yes]) - AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1, - [Define if needed for xReply])], - [AC_MSG_RESULT([unknown]) - AC_MSG_ERROR([xReply type unavailable. X11 is too old])])]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[xReply *rep;]])], + [AC_MSG_RESULT([no])], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include + #include ]], + [[xReply *rep;]])], + [AC_MSG_RESULT([yes]) + AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], [1], + [Define if needed for xReply])], + [AC_MSG_RESULT([unknown]) + AC_MSG_ERROR([xReply type unavailable. X11 is too old])])]) # Check for XConvertCase, XInternAtoms (X11R6 specific) @@ -1091,6 +1112,10 @@ if test "x$enable_x11_backend" == xyes; then fi fi + # Check for XGetEventData for GenericEvents + AC_CHECK_FUNC(XGetEventData, + AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent])) + # set up things for XInput if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then have_xinput=yes @@ -1194,7 +1219,7 @@ if test "x$enable_x11_backend" == xyes; then AM_CONDITIONAL(USE_X11, true) # strip leading space - X_EXTENSIONS=${X_EXTENSIONS/# } + X_EXTENSIONS=${X_EXTENSIONS#* } else XPACKAGES= @@ -1236,9 +1261,9 @@ fi 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_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB" GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS" # # If we aren't writing explicit dependencies, then don't put the extra libraries we need @@ -1286,12 +1311,16 @@ else fi GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0" -if test "x$enable_x11_backend" == xyes; then +if test "x$enable_x11_backend" = xyes; then GTK_PACKAGES="$GTK_PACKAGES pangoft2" fi GTK_EXTRA_LIBS= +if test x"$os_openbsd" = xyes; then + GTK_EXTRA_LIBS="$GTK_EXTRA_LIBS -lkvm" +fi + GTK_EXTRA_CFLAGS= -GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS" +GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $MATH_LIB" GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" if test x"$os_win32" = xyes; then @@ -1358,7 +1387,7 @@ LIBS="$old_LIBS" PRINT_BACKENDS="file lpr" AC_ARG_ENABLE(cups, - [AC_HELP_STRING([--disable-cups], + [AS_HELP_STRING([--disable-cups], [disable cups print backend])],, [enable_cups=auto]) @@ -1400,10 +1429,11 @@ else gtk_save_cflags="$CFLAGS" CFLAGS="$CUPS_CFLAGS" - AC_TRY_COMPILE([#include ], - [http_t http; char *s = http.authstring;], - [AC_DEFINE(HAVE_HTTP_AUTHSTRING, [], - [Define if cups http_t authstring field is accessible])],) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[http_t http; char *s = http.authstring;]])], + [AC_DEFINE([HAVE_HTTP_AUTHSTRING], [], + [Define if cups http_t authstring field is accessible])], + []) CFLAGS="$gtk_save_cflags" AC_SUBST(HAVE_HTTP_AUTHSTRING) @@ -1419,9 +1449,9 @@ fi # AC_ARG_ENABLE(papi, - [AC_HELP_STRING([--disable-papi], + [AS_HELP_STRING([--disable-papi], [disable papi print backend])],, - [enable_papi=auto]) + [enable_papi=auto]) if test "x$enable_papi" = "xno"; then AM_CONDITIONAL(HAVE_PAPI, false) @@ -1463,7 +1493,7 @@ CPPFLAGS="$gtk_save_cppflags" AC_ARG_ENABLE(test-print-backend, - [AC_HELP_STRING([--enable-test-print-backend], + [AS_HELP_STRING([--enable-test-print-backend], [build test print backend])],, [enable_test_print_backend=no]) if test "x$enable_test_print_backend" != "xno" ; then @@ -1502,39 +1532,95 @@ GLIB_GSETTINGS # GObject introspection ################################################## -GOBJECT_INTROSPECTION_CHECK([0.9.3]) +GOBJECT_INTROSPECTION_CHECK(introspection_required_version) ################################################## # Packagekit module ################################################# AC_ARG_ENABLE(packagekit, - AC_HELP_STRING([--disable-packagekit], - [build packagekit open-with module])) + [AS_HELP_STRING([--enable-packagekit=@<:@yes/no/auto@:>@], + [build PackageKit open-with module [default=auto]])], + [enable_packagekit="$enableval"], + [enable_packagekit=auto]) +if test "$enable_packagekit" = "auto"; then + if test "$os_win32" = "yes"; then + enable_packagekit=no + else + enable_packagekit=yes + fi +fi +AC_MSG_CHECKING([whether to use PackageKit]) build_packagekit=no -if test "os_win32" != "yes"; then - if test "x$enable_packagekit" != "xno"; then - build_packagekit=yes - AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit]) - fi +if test "x$enable_packagekit" != "xno"; then + if test "$os_win32" != "yes"; then + build_packagekit=yes + AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit]) + else + AC_MSG_ERROR([packagekit support is not available on win32]) + fi fi +AC_MSG_RESULT([$build_packagekit]) AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$build_packagekit" = "xyes") +################################################## +# colord module +################################################# + +AC_ARG_ENABLE(colord, + [AS_HELP_STRING([--enable-colord=@<:@yes/no/auto@:>@], + [build colord support code [default=auto]])], + [enable_colord="$enableval"], + [enable_colord=auto]) + +AC_MSG_CHECKING([whether to use colord]) +if test "$enable_colord" = "auto"; then + if test "$os_win32" = "yes"; then + enable_colord=no + fi +fi +if test "$enable_colord" != "no"; then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi + +have_colord=no +if test "$enable_colord" != "no"; then + if test "$os_win32" != "yes"; then + PKG_CHECK_MODULES(COLORD, colord >= 0.1.9, + have_colord=yes, have_colord=no) + if test "$enable_colord" = "yes"; then + if test "$have_colord" = "no"; then + AC_MSG_ERROR([--enable-colord specified, but not available]) + fi + fi + else + AC_MSG_ERROR([colord support is not available on win32]) + fi +fi + +if test "$have_colord" = "yes"; then + AC_DEFINE(HAVE_COLORD, 1, [define if we have colord]) +fi +AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes") + ################################################## # Checks for gtk-doc and docbook-tools ################################################## -GTK_DOC_CHECK([1.11]) +GTK_DOC_CHECK([1.11],[--flavour no-tmpl]) AC_CHECK_PROG(DB2HTML, db2html, true, false) AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) AC_ARG_ENABLE(man, - [AC_HELP_STRING([--enable-man], - [regenerate man pages from Docbook [default=no]])],enable_man=yes, - enable_man=no) + [AS_HELP_STRING([--enable-man], + [regenerate man pages from Docbook [default=no]])], + [enable_man=yes], + [enable_man=no]) if test "${enable_man}" != no; then dnl @@ -1607,16 +1693,17 @@ dnl Check for -Bsymbolic-functions linker flag used to avoid dnl intra-library PLT jumps, if available. dnl AC_ARG_ENABLE(Bsymbolic, - [AC_HELP_STRING([--disable-Bsymbolic], + [AS_HELP_STRING([--disable-Bsymbolic], [avoid linking with -Bsymbolic])],, [SAVED_LDFLAGS="${LDFLAGS}" AC_MSG_CHECKING([for -Bsymbolic-functions linker flag]) LDFLAGS=-Wl,-Bsymbolic-functions - AC_TRY_LINK([], [int main (void) { return 0; }], - AC_MSG_RESULT(yes) - enable_Bsymbolic=yes, - AC_MSG_RESULT(no) - enable_Bsymbolic=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], + [[int main (void) { return 0; }]])], + [AC_MSG_RESULT(yes) + enable_Bsymbolic=yes], + [AC_MSG_RESULT(no) + enable_Bsymbolic=no]) LDFLAGS="${SAVED_LDFLAGS}"]) if test "x${enable_Bsymbolic}" = "xyes" ; then @@ -1640,8 +1727,13 @@ po-properties/Makefile.in demos/Makefile demos/gtk-demo/Makefile demos/gtk-demo/geninclude.pl +demos/pixbuf-demo/Makefile examples/Makefile tests/Makefile +tests/a11y/Makefile +tests/css/Makefile +tests/css/parser/Makefile +tests/reftests/Makefile docs/Makefile docs/reference/Makefile docs/reference/gdk/Makefile @@ -1654,24 +1746,24 @@ docs/tools/Makefile build/Makefile build/win32/Makefile build/win32/vs9/Makefile +build/win32/vs10/Makefile gdk/Makefile +gdk/broadway/Makefile gdk/x11/Makefile 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/a11y/Makefile gtk/tests/Makefile +libgail-util/Makefile modules/Makefile -modules/other/Makefile -modules/other/gail/Makefile -modules/other/gail/libgail-util/Makefile -modules/other/gail/tests/Makefile modules/engines/Makefile modules/engines/pixbuf/Makefile modules/engines/ms-windows/Makefile @@ -1690,18 +1782,22 @@ perf/Makefile AC_OUTPUT # beautify the immodule list a bit -included_immodules=${included_immodules//,/ } -included_immodules=${included_immodules:-none} +included_immodules=$(echo "${included_immodules}" | $SED 's/,/ /g') +if test -z "${included_immodules}"; then included_immodules="none"; fi -echo "configuration:" +echo "" +echo " GTK+ $GTK_VERSION" +echo " ===========" +echo "" echo " GDK backends: $GDK_BACKENDS" -if test "x$enable_x11_backend" = "xyes"; then +if test "$enable_x11_backend" = "yes"; 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 " colord support: $have_colord" echo " Introspection: $found_introspection" echo " Debugging: $enable_debug" echo " Documentation: $enable_gtk_doc"