123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200 |
- Index: gtk+-2.12.12/configure.in
- ===================================================================
- --- gtk+-2.12.12.orig/configure.in 2008-09-13 02:01:07.000000000 +0200
- +++ gtk+-2.12.12/configure.in 2010-02-21 10:42:40.000000000 +0100
- @@ -32,9 +32,6 @@
-
- # required versions of other packages
- m4_define([glib_required_version], [2.13.5])
- -m4_define([pango_required_version], [1.17.3])
- -m4_define([atk_required_version], [1.9.0])
- -m4_define([cairo_required_version], [1.2.0])
-
-
- AC_INIT([gtk+], [gtk_version],
- @@ -239,12 +236,12 @@
- gdktarget=x11
- fi
-
- -AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
- +AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target],
- gdktarget=$with_gdktarget)
-
- AC_SUBST(gdktarget)
- case $gdktarget in
- - x11|win32|quartz|directfb) ;;
- + x11|win32|quartz|directfb|none) ;;
- *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
- esac
-
- @@ -349,10 +346,7 @@
- ## the version requirements since those make the module lists
- ## annoying to construct
- PKG_CHECK_MODULES(BASE_DEPENDENCIES,
- - [glib-2.0 >= glib_required_version dnl
- - atk >= atk_required_version dnl
- - pango >= pango_required_version dnl
- - cairo >= cairo_required_version])
- + [glib-2.0 >= glib_required_version])
-
- if test "$os_win32" != yes; then
- # libtool option to control which symbols are exported
- @@ -1061,7 +1055,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
- GDK_PIXBUF_XLIB_EXTRA_LIBS=
-
- -X_PACKAGES=fontconfig
- +X_PACKAGES=
- GDK_EXTRA_LIBS="$GDK_WLIBS"
- GDK_EXTRA_CFLAGS=
-
- @@ -1070,14 +1064,6 @@
- GTK_DEP_LIBS_FOR_X=
-
- if test "x$gdktarget" = "xx11"; then
- - #
- - # We use fontconfig very peripherally when decoding the default
- - # settings.
- - #
- - if $PKG_CONFIG --exists fontconfig; then : ; else
- - AC_MSG_ERROR([
- -*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.])
- - fi
-
- #
- # Check for basic X packages; we use pkg-config if available
- @@ -1124,16 +1110,6 @@
- gtk_save_LIBS=$LIBS
- LIBS="$x_libs_for_checks $LIBS"
-
- - # Sanity check for the X11 and Xext libraries. While everything we need from
- - # Xext is optional, the chances a system has *none* of these things is so
- - # small that we just unconditionally require it.
- - AC_CHECK_FUNC(XOpenDisplay, :,
- - 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
-
- AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
- @@ -1418,48 +1394,6 @@
- AM_CONDITIONAL(USE_DIRECTFB, 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`
- - PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES`
- -
- - AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS)
- -else
- - AC_MSG_ERROR([
- -*** Pango not found. Pango built with Cairo support is required
- -*** to build GTK+. See http://www.pango.org for Pango information.
- -])
- -fi
- -
- -CFLAGS="$CFLAGS $PANGO_CFLAGS"
- -
- -if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then
- - :
- -else
- - gtk_save_LIBS="$LIBS"
- - LIBS="$PANGO_LIBS $LIBS"
- - AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([
- -*** Can't link to Pango. Pango is required to build
- -*** GTK+. For more information see http://www.pango.org]))
- - LIBS="$gtk_save_LIBS"
- -fi
- -
- -CFLAGS="$saved_cflags"
- -LDFLAGS="$saved_ldflags"
- -
- -GDK_PACKAGES="$PANGO_PACKAGES"
- -if test "x$gdktarget" = "xx11"; then
- - GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
- -fi
- GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
- GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
-
- @@ -1468,7 +1402,7 @@
- # into the pkg-config files
- #
- if test $enable_explicit_deps != yes ; then
- - GDK_PACKAGES="$PANGO_PACKAGES"
- + GDK_PACKAGES=
- GDK_EXTRA_LIBS=
- fi
-
- @@ -1479,39 +1413,10 @@
- AC_SUBST(GDK_DEP_CFLAGS)
-
-
- -########################################
- -# Check for Accessibility Toolkit flags
- -########################################
- -
- -ATK_PACKAGES=atk
- -AC_MSG_CHECKING(ATK flags)
- -if $PKG_CONFIG --exists $ATK_PACKAGES ; then
- - ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES`
- - ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES`
- -
- - AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS)
- -else
- - AC_MSG_ERROR([
- -*** Accessibility Toolkit not found. Accessibility Toolkit is required
- -*** to build GTK+.
- -])
- -fi
- -
- -if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
- - :
- -else
- - gtk_save_LIBS="$LIBS"
- - LIBS="$ATK_LIBS $LIBS"
- - AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([
- - *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
- - *** to build GTK+]))
- - LIBS="$gtk_save_LIBS"
- -fi
- -
- -GTK_PACKAGES="atk cairo"
- +GTK_PACKAGES=
- 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_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
- GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
-
- if test x"$os_win32" = xyes; then
- @@ -1601,17 +1506,6 @@
-
- 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"
-
-
|