# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [9])
+m4_define([gtk_minor_version], [15])
m4_define([gtk_micro_version], [0])
-m4_define([gtk_version],
- [gtk_major_version.gtk_minor_version.gtk_micro_version])
m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
+m4_define([gtk_version],
+ [gtk_major_version.gtk_minor_version.gtk_micro_version])
# This is the X.Y used in -lgtk-FOO-X.Y
m4_define([gtk_api_version], [2.0])
# for GTK+.
#
#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
-m4_define([gtk_binary_version], [2.4.0])
+m4_define([gtk_binary_version], [2.10.0])
# required versions of other packages
-m4_define([glib_required_version], [2.9.0])
-m4_define([pango_required_version], [1.9.0])
-m4_define([atk_required_version], [1.0.1])
-m4_define([cairo_required_version], [0.9.2])
+m4_define([glib_required_version], [2.17.6])
+m4_define([pango_required_version], [1.20])
+m4_define([atk_required_version], [1.13.0])
+m4_define([cairo_required_version], [1.6])
AC_INIT([gtk+], [gtk_version],
AC_SUBST(LT_VERSION_INFO)
AC_SUBST(LT_CURRENT_MINUS_AGE)
+m4_define([gail_lt_current],[18])
+m4_define([gail_lt_revision],[1])
+m4_define([gail_lt_age],[0])
+m4_define([gail_lt_version_info],[gail_lt_current:gail_lt_revision:gail_lt_age])
+m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)])
+AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info])
+AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
#
# gdk-pixbuf gets versioned separately, and for now, using standard
GETTEXT_PACKAGE=gtk20
AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+ [The prefix for our gettext translation domains.])
AC_CANONICAL_HOST
MATH_LIB=-lm
AC_MSG_CHECKING([for native Win32])
+LIB_EXE_MACHINE_FLAG=X86
case "$host" in
*-*-mingw*)
os_win32=yes
+ gio_can_sniff=no
MATH_LIB=
+ case "$host" in
+ x86_64-*-*)
+ LIB_EXE_MACHINE_FLAG=X64
+ ;;
+ esac
;;
*)
os_win32=no
esac
AC_MSG_RESULT([$os_win32])
+AC_SUBST(LIB_EXE_MACHINE_FLAG)
+
case $host in
*-*-linux*)
os_linux=yes
;;
esac
+
dnl Initialize libtool
AC_PROG_CC
AM_DISABLE_STATIC
+dnl
+dnl Check for a working C++ compiler, but do not bail out, if none is found.
+dnl We use this for an automated test for C++ header correctness.
+dnl
+AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+AC_TRY_COMPILE(,[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)
+AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes")
+CXXFLAGS="$gtk_save_cxxflags"
+AC_LANG_RESTORE
+
if test "$os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; then
AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
+dnl when using libtool 2.x create libtool early, because it's used in configure
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+
# Make sure we use 64-bit versions of various file stuff.
AC_SYS_LARGEFILE
[AC_HELP_STRING([--enable-xkb],
[support XKB [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])],,
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])])
-AC_ARG_WITH(ie55,
- [AC_HELP_STRING([--with-ie55=DIRECTORY],
- [IE5.5 libs and headers (for Active IMM)])])
-
if test "$platform_win32" = yes; then
gdktarget=win32
else
gdktarget=x11
fi
-AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/linux-fb/win32]] select non-default GDK target],
+AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
gdktarget=$with_gdktarget)
AC_SUBST(gdktarget)
case $gdktarget in
- x11|linux-fb|win32) ;;
- *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb or win32.]);;
+ x11|win32|quartz|directfb) ;;
+ *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
esac
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
AC_SUBST(gdktargetlib)
AC_SUBST(gtktargetlib)
-AC_ARG_ENABLE(shadowfb,
- [AC_HELP_STRING([--disable-shadowfb],
- [disable shadowfb support for linux-fb])],,
- [enable_shadowfb=yes])
-
-AC_ARG_ENABLE(fbmanager,
- [AC_HELP_STRING([--enable-fbmanager],
- [enable framebuffer manager support (GtkFB)])],,
- enable_fbmanager=no)
-
if test "x$enable_debug" = "xyes"; then
test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
- GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
+ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
else
if test "x$enable_debug" = "xno"; then
GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
fi
fi
+
if test "x$enable_visibility" = "xno"; then
GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY"
fi
-AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}")
+AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}",
+ [Define if debugging is enabled])
# Build time sanity check...
fi
changequote([,])dnl
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+
# Ensure MSVC-compatible struct packing convention is used when
# compiling for Win32 with gcc.
# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
AC_MSG_CHECKING([Whether to write dependencies into .pc files])
case $enable_explicit_deps in
auto)
- deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
- if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
+ 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
enable_explicit_deps=no
fi
AC_SUBST(REBUILD)
-AC_CHECK_FUNCS(lstat mkstemp flockfile)
+AC_CHECK_FUNCS(lstat mkstemp flockfile getc_unlocked)
+AC_CHECK_FUNCS(localtime_r)
# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
[Define if _NL_TIME_FIRST_WEEKDAY is available])
fi
+# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define
+AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT])
+AC_TRY_LINK([#include <langinfo.h>], [
+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],
+ [Define if _NL_MEASUREMENT_MEASUREMENT is available])
+fi
+
+# _NL_PAPER_HEIGHT is an enum and not a define
+AC_MSG_CHECKING([for _NL_PAPER_HEIGHT])
+AC_TRY_LINK([#include <langinfo.h>], [
+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],
+ [Define if _NL_PAPER_HEIGHT is available])
+fi
+
+# _NL_PAPER_WIDTH is an enum and not a define
+AC_MSG_CHECKING([for _NL_PAPER_WIDTH])
+AC_TRY_LINK([#include <langinfo.h>], [
+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],
+ [Define if _NL_PAPER_WIDTH is available])
+fi
+
# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
AC_MSG_CHECKING(for sigsetjmp)
AC_TRY_LINK([#include <setjmp.h>], [
], gtk_ok=yes, gtk_ok=no)
AC_MSG_RESULT($gtk_ok)
if test "$gtk_ok" = "yes"; then
- AC_DEFINE(HAVE_SIGSETJMP)
+ AC_DEFINE(HAVE_SIGSETJMP, 1,
+ [Define to 1 if sigsetjmp is available])
fi
# i18n stuff
-# TRANSLATORS: Please note that gtk+ has both po/ and po-properties/
-# directories. If you add a new language to ALL_LINGUAS, please make
-# sure that both po/ and po-properties/ have .po files that correspond
-# to your language. If you only add one to po/, the build will break
-# in po-properties/.
-ALL_LINGUAS="af am ar az az_IR be bg bn br bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu hy ia id is it ja ko ku li lt lv mi mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta te th tk tr uk uz uz@Latn vi wa xh yi zh_CN zh_TW"
+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*)
*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
gobject gmodule-no-export gthread)
+# See if it's safe to turn G_DISABLE_DEPRECATED on.
+GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"`
+GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo glib_required_version | sed "s/\.@<:@^.@:>@*\$//"`
+if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
+ CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
+fi
+
+CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
+
+
dnl
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
dnl
AC_CHECK_FUNCS(bind_textdomain_codeset)
LIBS=$gtk_save_LIBS
-AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
-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_ie55+set}" = set && test $with_ie55 != no; then
- AC_MSG_CHECKING([for dimm.h])
- saved_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -idirafter $with_ie55/Include"
- AC_TRY_COMPILE([/* The w32api imm.h clashes a bit with the IE5.5 dimm.h */
-#ifdef __GNUC__
-#define IMEMENUITEMINFOA hidden_IMEMENUITEMINFOA
-#define IMEMENUITEMINFOW hidden_IMEMENUITEMINFOW
-#endif
-#include <windows.h>
-#include <objbase.h>
-#include <imm.h>
-#ifdef __GNUC__
-#undef IMEMENUITEMINFOA
-#undef IMEMENUITEMINFOW
-#endif
-#include <dimm.h>
-],
- [],
- [AC_MSG_RESULT(yes)
- AC_MSG_CHECKING([for IE55 uuid.lib])
- if test -f $with_ie55/Lib/uuid.lib ; then
- AC_MSG_RESULT(yes)
- have_ie55=yes
- AC_DEFINE(HAVE_DIMM_H)
- IE55_UUID_LIB="$with_ie55/Lib/uuid.lib"
- AC_SUBST(IE55_UUID_LIB)
- else
- AC_MSG_RESULT(no)
- CFLAGS="$saved_CFLAGS"
- have_ie55=no
- fi
- ],
- [AC_MSG_RESULT(no)
- CFLAGS="$saved_CFLAGS"
- have_ie55=no])
-fi
-AM_CONDITIONAL(HAVE_IE55, test x$have_ie55 = xyes)
-
-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])
+AC_CHECK_HEADERS(pwd.h,
+ AC_DEFINE(HAVE_PWD_H, 1,
+ [Define to 1 if pwd.h is available]))
+AC_CHECK_HEADERS(sys/time.h,
+ AC_DEFINE(HAVE_SYS_TIME_H, 1,
+ [Define to 1 if time.h is available]))
+AC_CHECK_HEADERS(unistd.h,
+ AC_DEFINE(HAVE_UNISTD_H, 1,
+ [Define to 1 if unistd.h is available]))
+AC_CHECK_HEADERS(ftw.h,
+ AC_DEFINE(HAVE_FTW_H, 1,
+ [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 <ftw.h>], [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])
+else
+ AC_MSG_RESULT([no])
fi
-AM_CONDITIONAL(HAVE_WINTAB, test x$have_wintab = xyes)
saved_cflags="$CFLAGS"
saved_ldflags="$LDFLAGS"
else
AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
if test $gtk_ok = yes; then
- AC_DEFINE(HAVE_SYS_SELECT_H)
+ 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)
+ AC_DEFINE(NO_FD_SET, 1,
+ [Define to 1 if fd_set is not available])
AC_MSG_RESULT(no)
fi
fi
AC_MSG_CHECKING(for wchar.h)
AC_TRY_CPP([#include <wchar.h>], gdk_wchar_h=yes, gdk_wchar_h=no)
if test $gdk_wchar_h = yes; then
- AC_DEFINE(HAVE_WCHAR_H,1,[Have wchar.h include file])
+ AC_DEFINE(HAVE_WCHAR_H, 1, [Have wchar.h include file])
fi
AC_MSG_RESULT($gdk_wchar_h)
AC_MSG_CHECKING(for wctype.h)
AC_TRY_CPP([#include <wctype.h>], gdk_wctype_h=yes, gdk_wctype_h=no)
if test $gdk_wctype_h = yes; then
- AC_DEFINE(HAVE_WCTYPE_H,1,[Have wctype.h include file])
+ AC_DEFINE(HAVE_WCTYPE_H, 1, [Have wctype.h include file])
fi
AC_MSG_RESULT($gdk_wctype_h)
LIBS="$oLIBS"
if test $gdk_working_wctype = no; then
- AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Is the wctype implementation broken])
+ AC_DEFINE(HAVE_BROKEN_WCTYPE, 1, [Is the wctype implementation broken])
GDK_WLIBS=
fi
AC_MSG_RESULT($gdk_working_wctype)
AC_MSG_CHECKING(for uxtheme.h)
AC_TRY_CPP([#include <uxtheme.h>], 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])
+ AC_DEFINE(HAVE_UXTHEME_H, 1, [Have uxtheme.h include file])
fi
AC_MSG_RESULT($gtk_uxtheme_h)
+# Checks for gdkspawn
+AC_CHECK_HEADERS(crt_externs.h)
+AC_CHECK_FUNCS(_NSGetEnviron)
+
##################################################
# Checks for gdk-pixbuf
esac
if $use_la_modules ; then
- AC_DEFINE(USE_LA_MODULES, 1, [Whether to load modules via .la files rather than directly])
+ AC_DEFINE(USE_LA_MODULES, 1,
+ [Whether to load modules via .la files rather than directly])
fi
fi
if $dynworks; then
- AC_DEFINE(USE_GMODULE)
+ AC_DEFINE(USE_GMODULE, 1,
+ [Define to 1 if gmodule works and should be used])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AC_ARG_WITH(libtiff,
[AC_HELP_STRING([--without-libtiff],
[disable TIFF loader for gdk-pixbuf])])
+AC_ARG_WITH(libjasper,
+ [AC_HELP_STRING([--without-libjasper],
+ [disable JPEG2000 loader for gdk-pixbuf])])
+
+AC_ARG_ENABLE(gdiplus,
+ [AC_HELP_STRING([--disable-gdiplus],
+ [disable GDI+ loaders for gdk-pixbuf])])
+
+AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$enable_gdiplus != xno ])
dnl Test for libtiff
+if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
- AC_CHECK_LIB(tiff, TIFFReadScanline,
+ AC_CHECK_LIB(tiff, TIFFReadRGBAImageOriented,
[AC_CHECK_HEADER(tiffio.h,
TIFF='tiff'; LIBTIFF='-ltiff',
AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
*** --without-libtiff to configure but some programs using GTK+ may
*** not work properly])
fi
+fi
dnl Test for libjpeg
+if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
jpeg_ok=yes,
if test "$jpeg_ok" = yes; then
LIBJPEG='-ljpeg'
AC_CHECK_LIB(jpeg, jpeg_simple_progression,
- AC_DEFINE(HAVE_PROGRESSIVE_JPEG),
+ AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1,
+ [Define to 1 is libjpeg supports progressive JPEG]),
AC_MSG_WARN(JPEG library does not support progressive saving.))
else
AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
*** --without-libjpeg to configure but some programs using GTK+ may
*** not work properly])
fi
+fi
dnl Test for libpng
if test x$with_libpng != xno && test -z "$LIBPNG"; then
*** from CVS.])
fi
+dnl Test for libjasper
+ if test x$with_libjasper != xno && test -z "$LIBJASPER"; then
+ AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg)
+ fi
+
+ if test x$with_libjasper != xno && test -z "$LIBJASPER"; then
+ AC_MSG_ERROR([
+*** Checks for JPEG2000 loader failed. You can build without it by passing
+*** --without-libjasper to configure])
+ fi
+
AC_SUBST(LIBTIFF)
AC_SUBST(LIBJPEG)
AC_SUBST(LIBPNG)
+AC_SUBST(LIBJASPER)
AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
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"
+# Use the traditional png loader instead of the GDI+ one on Windows,
+# because some important apps like GIMP need to read and write
+# arbitrary tEXt chunks which doesn't seem to be possible through GDI+
+
+all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm"
+if test x$with_libjasper != xno; then
+ all_loaders="$all_loaders,jasper"
+fi
+if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then
+ # Skip PNG, see comment above
+ gdip_formats="bmp emf gif ico jpeg tiff wmf"
+ for f in $gdip_formats; do
+ all_loaders="$all_loaders,gdip-$f"
+ done
+else
+ all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff"
+fi
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_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader"
+ loader_underscores=`echo $loader | sed -e 's/-/_/g'`
+ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la"
+
+ # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader
+ case $loader in
+ gdip-*) ;;
+ *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";;
+ esac
+ eval INCLUDE_$loader_underscores=yes
done
+
+# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders
+# (except gdip-png, which isn't built at all)
+if test x"$INCLUDE_gdip_ico" = xyes; then
+ INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus"
+fi
+
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])
+AM_CONDITIONAL(INCLUDE_ICNS, [test x"$INCLUDE_icns" = xyes])
+AM_CONDITIONAL(INCLUDE_JASPER, [test x"$INCLUDE_jasper" = xyes])
+# As all GDI+ loaders are either built-in or not, arbitrarily just
+# check one of the variables here
+AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
+
+if test x$gio_can_sniff = x; then
+ AC_MSG_CHECKING([if gio can sniff png])
+ gtk_save_LIBS="$LIBS"
+ gtk_save_CFLAGS="$CFLAGS"
+ LIBS="`$PKG_CONFIG --libs gio-2.0`"
+ CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <gio/gio.h>
+ static const gsize data_size = 159;
+ static const guint8 data[] =
+ {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
+ 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
+ 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
+ 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+ 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
+ 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
+ 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
+ 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
+ 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+ 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
+ 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
+ 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
+ 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+ 0x42, 0x60, 0x82
+ };
+ int
+ main (int argc, char **argv)
+ {
+ char *content_type;
+ char *image_png;
+ content_type = g_content_type_guess (NULL, data, data_size, NULL);
+ image_png = g_content_type_from_mime_type ("image/png");
+ return !!strcmp (content_type, image_png);
+ }]])],
+ [gio_can_sniff=yes
+ AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
+ [gio_can_sniff=no])
+ AC_MSG_RESULT($gio_can_sniff)
+ LIBS="$gtk_save_LIBS"
+ CFLAGS="$gtk_save_CFLAGS"
+fi
+
+#
+# Allow building some or all immodules included
+#
+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,
+[ --with-included-immodules=MODULE1,MODULE2,...
+ build the specified input methods into gtk])
+
+if $dynworks; then
+ :
+else
+ ## if the option was specified, leave it; otherwise disable included immodules
+ if test x$with_included_immodules = xno; then
+ with_included_immodules=yes
+ 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
+
+included_immodules=""
+# If the switch specified without listing any specific ones, include all
+if test "x$with_included_immodules" = xyes ; then
+ included_immodules="$all_immodules"
+else
+ included_immodules="$with_included_immodules"
+fi
+
+AC_MSG_RESULT($included_immodules)
+AM_CONDITIONAL(HAVE_INCLUDED_IMMMODULES, test "x$included_immodules" != x)
+
+INCLUDED_IMMODULE_OBJ=
+INCLUDED_IMMODULE_DEFINE=
+
+IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS=","
+for immodule in $included_immodules; do
+ immodule_underscores=`echo $immodule | sed -e 's/-/_/g'`
+ if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then
+ :
+ else
+ AC_MSG_ERROR([the specified input method $immodule does not exist])
+ fi
+
+ INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la"
+ INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores"
+ eval INCLUDE_$immodule_underscores=yes
+done
+IFS="$gtk_save_ifs"
+AC_SUBST(INCLUDED_IMMODULE_OBJ)
+AC_SUBST(INCLUDED_IMMODULE_DEFINE)
+
+AM_CONDITIONAL(INCLUDE_IM_AM_ET, [test x"$INCLUDE_am_et" = xyes])
+AM_CONDITIONAL(INCLUDE_IM_CEDILLA, [test x"$INCLUDE_cedilla" = xyes])
+AM_CONDITIONAL(INCLUDE_IM_CYRILLIC_TRANSLIT, [test x"$INCLUDE_cyrillic_translit" = xyes])
+AM_CONDITIONAL(INCLUDE_IM_IME, [test x"$INCLUDE_ime" = xyes])
+AM_CONDITIONAL(INCLUDE_IM_INUKTITUT, [test x"$INCLUDE_inuktitut" = xyes])
+AM_CONDITIONAL(INCLUDE_IM_IPA, [test x"$INCLUDE_ipa" = xyes])
+AM_CONDITIONAL(INCLUDE_IM_MULTIPRESS, [test x"$INCLUDE_multipress" = xyes])
+AM_CONDITIONAL(INCLUDE_IM_THAI, [test x"$INCLUDE_thai" = xyes])
+AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes])
+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
AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
+AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
if $dynworks ; then
STATIC_LIB_DEPS=
STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
fi
+# Checks to see whether we should include mediaLib
+# support.
+#
+AC_CHECK_HEADER(sys/systeminfo.h,
+ AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1,
+ [Define to 1 if sys/systeminfo.h is available]))
+AC_CHECK_HEADER(sys/sysinfo.h,
+ AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
+ [Define to 1 if sys/sysinfo.h is available]))
+
+AC_MSG_CHECKING(for mediaLib 2.3)
+use_mlib25=no
+# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib
+# patch requires.
+AC_CHECK_LIB(mlib, mlib_ImageSetStruct, use_mlib=yes, use_mlib=no)
+if test $use_mlib = yes; then
+ AC_DEFINE(USE_MEDIALIB, 1,
+ [Define to 1 if medialib is available and should be used])
+ MEDIA_LIB=-lmlib
+
+ AC_MSG_CHECKING(for mediaLib 2.5)
+ # Check for a mediaLib 2.5 function since that is what is needed for
+ # gdk_rgb_convert integration.
+ AC_CHECK_LIB(mlib, mlib_VideoColorRGBint_to_BGRAint, use_mlib25=yes, use_mlib25=no)
+ if test $use_mlib25 = yes; then
+ AC_DEFINE(USE_MEDIALIB25, 1,
+ [Define to 1 if medialib 2.5 is available])
+ fi
+fi
+AM_CONDITIONAL(USE_MEDIALIB, test $use_mlib = yes)
+AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
+
# Checks to see if we should compile in MMX support (there will be
# a runtime test when the code is actually run to see if it should
# be used - this just checks if we can compile it.)
ac_ext=$save_ac_ext
if test $use_mmx_asm = yes; then
- AC_DEFINE(USE_MMX)
+ AC_DEFINE(USE_MMX, 1,
+ [Define to 1 if XXM is available and should be used])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
REBUILD_PNGS=
-if test -z "$LIBPNG"; then
+if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then
REBUILD_PNGS=#
fi
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
-if test ! -f $srcdir/gtk/stock-icons/gtkstockpixbufs.h &&
+if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
test "x$REBUILD_PNGS" = "x#" ; then
AC_MSG_ERROR([
-*** gtkstockpixbufs.h is not in the tree, and cannot be built
+*** 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)
-GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0"
-GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"
+GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
+GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
GDK_PIXBUF_EXTRA_CFLAGS=
GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
-AC_SUBST(GDK_PIXBUF_PACKAGES)
-AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
-AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS)
-AC_SUBST(GDK_PIXBUF_DEP_LIBS)
-AC_SUBST(GDK_PIXBUF_DEP_CFLAGS)
-
-
########################################
# Windowing system checks
########################################
#
# Check for basic X packages; we use pkg-config if available
#
- if $PKG_CONFIG --exists x11 xext; then
+ if $PKG_CONFIG --exists x11 xext xrender; then
have_base_x_pc=true
- X_PACKAGES="$X_PACKAGES x11 xext"
- x_libs="`pkg-config --libs x11 xext`"
+ X_PACKAGES="$X_PACKAGES x11 xext xrender"
+ x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
+ X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
# Strip out any .la files that pkg-config might give us (this happens
# with -uninstalled.pc files)
fi
x_cflags="$X_CFLAGS"
- x_libs_for_checks="$X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
+ x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags"
GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
- GTK_DEP_LIBS_FOR_X="$X_LIBS -lX11 $X_EXTRA_LIBS"
+ GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS"
fi
# Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
AC_CHECK_FUNC(XextFindDisplay, :,
AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
+ AC_CHECK_FUNC(XRenderQueryExtension, :,
+ AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.]))
# Check for xReply
[xReply *rep;],
[AC_MSG_RESULT([yes])
AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1,
- [Define if <X11/extensions/XIproto.h> needed for xReply])],
+ [Define if <X11/extensions/XIproto.h> needed for xReply])],
[AC_MSG_RESULT([unknown])
AC_MSG_ERROR([xReply type unavailable. X11 is too old])])])
have_x11r6=true)
if $have_x11r6; then
- AC_DEFINE(HAVE_X11R6,1,[Define if we have X11R6])
+ AC_DEFINE(HAVE_X11R6, 1, [Define if we have X11R6])
fi
AM_CONDITIONAL(HAVE_X11R6, $have_x11r6)
if test "x$enable_xkb" = "xyes"; then
AC_MSG_WARN(XKB support explicitly enabled)
- AC_DEFINE(HAVE_XKB)
+ AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension])
elif test "x$enable_xkb" = "xmaybe"; then
AC_CHECK_FUNC(XkbQueryExtension,
- AC_DEFINE(HAVE_XKB))
+ AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]))
else
AC_MSG_WARN(XKB support explicitly disabled)
fi
# Check for shaped window extension
AC_CHECK_FUNC(XShapeCombineMask,
- AC_DEFINE(HAVE_SHAPE_EXT))
+ AC_DEFINE(HAVE_SHAPE_EXT, 1,
+ [Define to 1 if the XShape extension is available]))
# X SYNC check
+ gtk_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $x_cflags"
AC_CHECK_FUNC(XSyncQueryExtension,
[AC_CHECK_HEADER(X11/extensions/sync.h,
- AC_DEFINE(HAVE_XSYNC, 1, Have the SYNC extension library),
+ AC_DEFINE(HAVE_XSYNC, 1, [Have the SYNC extension library]),
:, [#include <X11/Xlib.h>])])
+ CFLAGS="$gtk_save_CFLAGS"
+
# Xshm checks
if test "x$enable_shm" = "xyes"; then
if test "x$enable_shm" = "xyes"; then
# Check for shared memory
- AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes)
- AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes)
+ AC_CHECK_HEADER(sys/ipc.h,
+ AC_DEFINE(HAVE_IPC_H, 1,
+ [Define to 1 if ipc.h is available]),
+ no_sys_ipc=yes)
+ AC_CHECK_HEADER(sys/shm.h,
+ AC_DEFINE(HAVE_SHM_H, 1,
+ [Define to 1 if shm.h is available]),
+ no_sys_shm=yes)
# Check for the X shared memory extension header file
have_xshm=no
fi
AC_MSG_RESULT($have_xshm)
if test $have_xshm = yes ; then
- AC_DEFINE(HAVE_XSHM_H)
+ AC_DEFINE(HAVE_XSHM_H, 1,
+ [Define to 1 if xshm.h is available])
fi
fi
- # Check for Xinerama extension (Solaris impl or Xfree impl)
-
- gtk_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $x_cflags"
+ if test "x$enable_xinerama" = "xyes"; then
+ # Check for Xinerama extension (Solaris impl or Xfree impl)
+ gtk_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $x_cflags"
- case "$host" in
+ case "$host" in
*-*-solaris*)
# Check for solaris
AC_MSG_CHECKING(for Xinerama support on Solaris)
[#include <X11/Xlib.h>])])
if $have_solaris_xinerama ; then
- AC_DEFINE(HAVE_SOLARIS_XINERAMA)
- AC_DEFINE(HAVE_XINERAMA)
+ AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
+ [Define to 1 if solaris xinerama is available])
+ AC_DEFINE(HAVE_XINERAMA, 1,
+ [Define to 1 if xinerama is available])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
[AC_CHECK_HEADER(X11/extensions/Xinerama.h,
[GTK_ADD_LIB(x_extra_libs,Xinerama)
- have_xfree_xinerama=true], :
+ have_xfree_xinerama=true], :,
[#include <X11/Xlib.h>])])
fi
if $have_xfree_xinerama ; then
- AC_DEFINE(HAVE_XFREE_XINERAMA)
- AC_DEFINE(HAVE_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)
fi
;;
- esac
-
+ esac
+ fi
+
# set up things for XInput
if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
- AC_DEFINE(XINPUT_XFREE)
+ AC_DEFINE(XINPUT_XFREE, 1,
+ [Define to 1 if XFree XInput should be used])
if $PKG_CONFIG --exists xi ; then
X_PACKAGES="$X_PACKAGES xi"
GTK_ADD_LIB(x_extra_libs, Xi)
fi
else
- AC_DEFINE(XINPUT_NONE)
+ AC_DEFINE(XINPUT_NONE, 1,
+ [Define to 1 if no XInput should be used])
fi
AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes)
# Check for the RANDR extension
+ if $PKG_CONFIG --exists "xrandr >= 1.2" ; then
+ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
- have_randr=false
- if $PKG_CONFIG --exists xrandr ; then
- have_randr=true
- X_PACKAGES="$X_PACKAGES xrandr"
- else
- AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
- [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
- # RANDR requires RENDER
- [have_randr=true
- GTK_ADD_LIB(x_extra_libs, Xrender)
- GTK_ADD_LIB(x_extra_libs, Xrandr)],
- :, [#include <X11/Xlib.h>])])
- fi
-
- if $have_randr ; then
- AC_DEFINE(HAVE_RANDR, 1, Have the Xrandr extension library)
+ X_PACKAGES="$X_PACKAGES xrandr"
fi
# Checks for Xcursor library
if $PKG_CONFIG --exists xcursor ; then
- AC_DEFINE(HAVE_XCURSOR, 1, Have the Xcursor library)
+ AC_DEFINE(HAVE_XCURSOR, 1, [Have the Xcursor library])
X_PACKAGES="$X_PACKAGES xcursor"
fi
# Checks for XFixes extension
if $PKG_CONFIG --exists xfixes ; then
- AC_DEFINE(HAVE_XFIXES, 1, Have the XFIXES X extension)
+ 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
+
+ # Checks for Xcomposite extension
+
+ 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"
+ fi
+
+ # Checks for Xdamage extension
+
+ 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"
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"
+ 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
+
GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
-if test "x$gdktarget" = "xlinux-fb"; then
- if test x$enable_shadowfb = xyes ; then
- AC_DEFINE(ENABLE_SHADOW_FB)
- fi
+if test "x$gdktarget" = "xdirectfb"; then
+ DIRECTFB_REQUIRED_VERSION=0.9.24
+ AC_MSG_CHECKING(for DirectFB)
- if test x$enable_fbmanager = xyes ; then
- AC_DEFINE(ENABLE_FB_MANAGER)
- AM_CONDITIONAL(ENABLE_FB_MANAGER, true)
+ 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
- AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
+ AC_MSG_ERROR([
+*** 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
-
- AM_CONDITIONAL(USE_LINUX_FB, true)
+
+ AM_CONDITIONAL(USE_DIRECTFB, true)
else
- AM_CONDITIONAL(USE_LINUX_FB, false)
- AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
+ AM_CONDITIONAL(USE_DIRECTFB, false)
fi
+
# Check for Pango flags
if test "x$gdktarget" = "xwin32"; then
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
-GDK_PACKAGES="$PANGO_PACKAGES"
+GDK_PACKAGES="$PANGO_PACKAGES gio-2.0"
if test "x$gdktarget" = "xx11"; then
GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
fi
LIBS="$gtk_save_LIBS"
fi
-GTK_PACKAGES="atk cairo"
+GTK_PACKAGES="atk cairo gio-2.0"
+if test "x$gdktarget" = "xx11"; then
+ GTK_PACKAGES="$GTK_PACKAGES pangoft2"
+fi
GTK_EXTRA_LIBS=
GTK_EXTRA_CFLAGS=
GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
GTK_EXTRA_CFLAGS="$msnative_struct"
fi
+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
+PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
+CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
+
+if test $enable_explicit_deps != yes ; then
+ GDK_PIXBUF_EXTRA_LIBS=
+fi
+
+AC_SUBST(GDK_PIXBUF_PACKAGES)
+AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
+AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS)
+AC_SUBST(GDK_PIXBUF_DEP_LIBS)
+AC_SUBST(GDK_PIXBUF_DEP_CFLAGS)
+
AC_SUBST(GTK_PACKAGES)
AC_SUBST(GTK_EXTRA_LIBS)
AC_SUBST(GTK_EXTRA_CFLAGS)
AC_SUBST(GTK_DEP_LIBS)
AC_SUBST(GTK_DEP_CFLAGS)
+AC_SUBST(GLIB_PREFIX)
+AC_SUBST(ATK_PREFIX)
+AC_SUBST(PANGO_PREFIX)
+AC_SUBST(CAIRO_PREFIX)
AC_SUBST(GTK_DEBUG_FLAGS)
AC_SUBST(GTK_XIM_FLAGS)
+########################
+# Checks needed for gail
+########################
+
+old_LIBS="$LIBS"
+dnl Checks for inet libraries:
+AC_SEARCH_LIBS(gethostent, nsl)
+AC_SEARCH_LIBS(setsockopt, socket)
+AC_SEARCH_LIBS(connect, inet)
+
+dnl check for the sockaddr_un.sun_len member
+AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
+ [struct_sockaddr_un_sun_len=true],
+ [struct_sockaddr_un_suin_len=false],
+ [#include <sys/types.h>
+ #include <sys/un.h>]
+ )
+case $struct_sockaddr_un_sun_len in
+ true)
+ AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1,
+ [Have the sockaddr_un.sun_len member])
+ ;;
+ *)
+ ;;
+esac
+
+GAIL_INET_LIBS="$LIBS"
+AC_SUBST([GAIL_INET_LIBS])
+
+LIBS="$old_LIBS"
+
+################################################################
+# Printing system checks
+################################################################
+
+AC_ARG_ENABLE(cups,
+ [AC_HELP_STRING([--disable-cups]
+ [disable cups print backend])],,
+ [enable_cups=auto])
+
+if test "x$enable_cups" = "xauto"
+then
+ AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
+ if test "x$CUPS_CONFIG" != "xno"; then
+ CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
+ CUPS_LIBS=`$CUPS_CONFIG --libs`
+
+ CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
+ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
+ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
+
+ if test $CUPS_API_MAJOR -gt 1 -o \
+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
+ AC_DEFINE(HAVE_CUPS_API_1_2, 1,
+ [Define to 1 if CUPS 1.2 API is available])
+ fi
+
+ AC_SUBST(CUPS_API_MAJOR)
+ AC_SUBST(CUPS_API_MINOR)
+ AC_SUBST(CUPS_CFLAGS)
+ AC_SUBST(CUPS_LIBS)
+
+ AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
+ fi
+ AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
+
+ gtk_save_cflags="$CFLAGS"
+ CFLAGS="$CUPS_CFLAGS"
+ AC_TRY_COMPILE([#include <cups/http.h>],
+ [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)
+
+ gtk_save_libs="$LIBS"
+ LIBS="$CUPS_LIBS"
+ AC_CHECK_FUNCS(httpGetAuthString)
+ LIBS="$gtk_save_libs"
+
+else
+ AM_CONDITIONAL(HAVE_CUPS, false)
+fi
+
+gtk_save_cppflags="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
+
+AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
+*** Can't find cairo-pdf.h. You must build Cairo with the pdf
+*** backend enabled.]))
+
+if test "$os_win32" != "yes"; then
+ AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
+*** Can't find cairo-ps.h. You must build Cairo with the
+*** postscript backend enabled.]))
+fi
+
+CPPFLAGS="$gtk_save_cppflags"
+
+
+AC_ARG_ENABLE(test-print-backend,
+ [AC_HELP_STRING([--enable-test-print-backend],
+ [build test print backend])],,
+ [enable_test_print_backend=no])
+AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
+
+
################################################################
# Strip -export-dynamic from the link lines of various libraries
################################################################
#
# 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//"`
# Checks for gtk-doc and docbook-tools
##################################################
-GTK_DOC_CHECK([1.4])
+GTK_DOC_CHECK([1.8])
AC_CHECK_PROG(DB2HTML, db2html, true, false)
AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
extern "C" {
#endif /* __cplusplus */
+#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
#define GDK_WINDOWING_X11'
elif test "x$gdktarget" = "xwin32" ; then
gdk_windowing='
+#define GDK_NATIVE_WINDOW_POINTER
+
#define GDK_WINDOWING_WIN32'
-elif test "x$gdktarget" = "xlinux-fb" ; then
+elif test "x$gdktarget" = "xquartz" ; then
+ gdk_windowing='
+#define GDK_WINDOWING_QUARTZ'
+elif test "x$gdktarget" = "xdirectfb" ; then
gdk_windowing='
-#define GDK_WINDOWING_FB
-#define GDK_NATIVE_WINDOW_POINTER'
+#define GDK_WINDOWING_DIRECTFB'
fi
if test x$gdk_wchar_h = xyes; then
gdk-pixbuf-2.0.pc
gdk-2.0.pc
gtk+-2.0.pc
+gtk+-unix-print-2.0.pc
+gail.pc
gdk-pixbuf-2.0-uninstalled.pc
gdk-2.0-uninstalled.pc
gtk+-2.0-uninstalled.pc
+gail-uninstalled.pc
m4macros/Makefile
po/Makefile.in
po-properties/Makefile.in
docs/reference/gdk/version.xml
docs/reference/gtk/Makefile
docs/reference/gtk/version.xml
+docs/reference/libgail-util/Makefile
docs/faq/Makefile
docs/tools/Makefile
docs/tutorial/Makefile
gdk/win32/Makefile
gdk/win32/rc/Makefile
gdk/win32/rc/gdk.rc
-gdk/linux-fb/Makefile
+gdk/quartz/Makefile
+gdk/directfb/Makefile
+gdk/tests/Makefile
gtk/Makefile
gtk/makefile.msc
gtk/gtkversion.h
gtk/gtk-win32.rc
-gtk/stock-icons/Makefile
gtk/theme-bits/Makefile
-gtk/xdgmime/Makefile
+gtk/tests/Makefile
modules/Makefile
-modules/input/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
modules/engines/ms-windows/Theme/Makefile
modules/engines/ms-windows/Theme/gtk-2.0/Makefile
+modules/input/Makefile
+modules/printbackends/Makefile
+modules/printbackends/cups/Makefile
+modules/printbackends/lpr/Makefile
+modules/printbackends/file/Makefile
+modules/printbackends/test/Makefile
perf/Makefile
contrib/Makefile
contrib/gdk-pixbuf-xlib/Makefile
echo "configuration:
target: $gdktarget"
-
-if test "x$gdktarget" = "xlinux-fb"; then
- echo "Warning: The linux-fb GDK target is unmaintained"
- echo " and may not work or even compile"
-fi
-
projects / ~andy / gtk / blobdiff