# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [10])
-m4_define([gtk_micro_version], [3])
+m4_define([gtk_minor_version], [11])
+m4_define([gtk_micro_version], [0])
m4_define([gtk_version],
[gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [3])
+m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
# This is the X.Y used in -lgtk-FOO-X.Y
# required versions of other packages
m4_define([glib_required_version], [2.12.0])
-m4_define([pango_required_version], [1.12.0])
+m4_define([pango_required_version], [1.15.3])
m4_define([atk_required_version], [1.9.0])
m4_define([cairo_required_version], [1.2.0])
AC_ARG_WITH(xinput,
[AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
-AC_ARG_WITH(wintab,
- [AC_HELP_STRING([--with-wintab=DIRECTORY],
- [use Wintab API with win32 backend])])
if test "$platform_win32" = yes; then
gdktarget=win32
else
AC_MSG_CHECKING([Whether to write dependencies into .pc files])
case $enable_explicit_deps in
auto)
- deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh`
+ 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
enable_explicit_deps=yes
else
fi
AC_SUBST(REBUILD)
-AC_CHECK_FUNCS(lstat mkstemp flockfile)
+AC_CHECK_FUNCS(lstat mkstemp flockfile getc_unlocked)
# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
-if test "${with_wintab+set}" = set && test $with_wintab != no; then
- AC_MSG_CHECKING([for wintab.h])
- saved_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$with_wintab/include"
- AC_TRY_COMPILE([#include <windows.h>
-#include <wintab.h>],
- [],
- [AC_MSG_RESULT(yes)
- AC_MSG_CHECKING([for wntab32x.lib])
- if test -f $with_wintab/lib/i386/wntab32x.lib ; then
- AC_MSG_RESULT(yes)
- have_wintab=yes
- AC_DEFINE(HAVE_WINTAB)
- WINTAB_LIB="$with_wintab/lib/i386/wntab32x.lib"
- AC_SUBST(WINTAB_LIB)
- else
- AC_MSG_RESULT(no)
- CFLAGS="$saved_cflags"
- have_wintab=no
- fi
- ],
- [AC_MSG_RESULT(no)
- CFLAGS="$saved_cflags"
- have_wintab=no])
-fi
-AM_CONDITIONAL(HAVE_WINTAB, test x$have_wintab = xyes)
-
saved_cflags="$CFLAGS"
saved_ldflags="$LDFLAGS"
fi
AC_MSG_RESULT($gtk_uxtheme_h)
+# Checks for gdkspawn
+AC_CHECK_HEADERS(crt_externs.h)
+AC_CHECK_FUNCS(_NSGetEnviron)
+
##################################################
# Checks for gdk-pixbuf
dnl due to an autoconf bug, commas in the first arg to
dnl AC_HELP_STRING cause problems.
dnl AC_HELP_STRING([--with-included-loaders=LOADER1 LOADER2 ...],
-dnl [build the specified loaders into gdk-pixbuf (only used if module loading disabled)])
+dnl [build the specified loaders into gdk-pixbuf])
AC_ARG_WITH(included_loaders,
[ --with-included-loaders=LOADER1,LOADER2,...
- build the specified loaders into gdk-pixbuf (only
- used if module loading disabled)])
+ build the specified loaders into gdk-pixbuf])
if $dynworks; then
- :
+ :
else
## if the option was specified, leave it; otherwise disable included loaders
if test x$with_included_loaders = xno; then
fi
fi
-all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,tga,pcx"
+all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,xbm,tga,pcx"
included_loaders=""
# If no loaders specified, include all
if test "x$with_included_loaders" = xyes ; then
AC_MSG_ERROR([the specified loader $loader does not exist])
fi
- INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libpixbufloader-static-$loader.la"
+ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la"
INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader"
+ eval INCLUDE_$loader=yes
done
IFS="$gtk_save_ifs"
AC_SUBST(INCLUDED_LOADER_OBJ)
AC_SUBST(INCLUDED_LOADER_DEFINE)
+AM_CONDITIONAL(INCLUDE_PNG, [test x"$INCLUDE_png" = xyes])
+AM_CONDITIONAL(INCLUDE_BMP, [test x"$INCLUDE_bmp" = xyes])
+AM_CONDITIONAL(INCLUDE_WBMP, [test x"$INCLUDE_wbmp" = xyes])
+AM_CONDITIONAL(INCLUDE_GIF, [test x"$INCLUDE_gif" = xyes])
+AM_CONDITIONAL(INCLUDE_ICO, [test x"$INCLUDE_ico" = xyes])
+AM_CONDITIONAL(INCLUDE_ANI, [test x"$INCLUDE_ani" = xyes])
+AM_CONDITIONAL(INCLUDE_JPEG, [test x"$INCLUDE_jpeg" = xyes])
+AM_CONDITIONAL(INCLUDE_PNM, [test x"$INCLUDE_pnm" = xyes])
+AM_CONDITIONAL(INCLUDE_RAS, [test x"$INCLUDE_ras" = xyes])
+AM_CONDITIONAL(INCLUDE_TIFF, [test x"$INCLUDE_tiff" = xyes])
+AM_CONDITIONAL(INCLUDE_XPM, [test x"$INCLUDE_xpm" = xyes])
+AM_CONDITIONAL(INCLUDE_XBM, [test x"$INCLUDE_xbm" = xyes])
+AM_CONDITIONAL(INCLUDE_TGA, [test x"$INCLUDE_tga" = xyes])
+AM_CONDITIONAL(INCLUDE_PCX, [test x"$INCLUDE_pcx" = xyes])
+
AC_HEADER_SYS_WAIT
AC_TYPE_SIGNAL
if test $cross_compiling = yes; then
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
- if test x$GDK_PIXBUF_CSOURCE = xno; 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
AC_MSG_ERROR([
*** gtkbuiltincache.h is not in the tree, and cannot be built
*** because you don't have libpng, or (when cross-compiling) you
-*** don't have a prebuilt gdk-pixbuf-csource on the host system.])
+*** don't have a prebuilt gtk-update-icon-cache on the build system.])
fi
AC_SUBST(REBUILD_PNGS)
AC_DEFINE(HAVE_XFIXES, 1, Have the XFIXES X extension)
X_PACKAGES="$X_PACKAGES xfixes"
+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
fi
if $have_base_x_pc ; then
fi
if test "x$gdktarget" = "xwin32"; then
- # We start off with the libraries from Pango
-
- if test x$have_wintab = xyes; then
- GDK_WIN32_EXTRA_CFLAGS="-I $with_wintab/include"
- AC_SUBST(GDK_WIN32_EXTRA_CFLAGS)
- fi
-
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -Wl,-luuid"
AM_CONDITIONAL(USE_WIN32, true)
else
DIRECTFB_REQUIRED_VERSION=0.9.24
AC_MSG_CHECKING(for DirectFB)
- if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then
+ if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
AC_MSG_RESULT(found)
GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS"
GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS"
else
AC_MSG_ERROR([
-*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest
-*** version of DirectFB is always available from http://www.directfb.org/.
+*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
+*** are required. The latest version of DirectFB is always available
+*** from http://www.directfb.org/.
])
fi
#
# We are using gmodule-no-export now, but I'm leaving the stripping
# code in place for now, since pango and atk still require gmodule.
+export SED
export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
if test -n "$export_dynamic"; then
GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`