diff options
| author | Johan Dahlin <jdahlin@async.com.br> | 2008-04-15 14:41:16 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2008-04-15 14:41:16 +0000 |
| commit | 46cd328b1ffdda568cefd580cb14a91276050190 (patch) | |
| tree | d4d2b0e3fffe1834f61b123b8bda58808a97dbff | |
| parent | 8a4d72e1099279c2134717041e1513eb99076c17 (diff) | |
| download | pygtk-2-12.tar.gz | |
patch by: Johan Euphrosine <proppy@aminche.com>pygtk-2-12
2008-04-15 Johan Dahlin <jdahlin@async.com.br>
patch by: Johan Euphrosine <proppy@aminche.com>
* configure.in:
Unbreak pango/cairo dependency chains (bug #528217)
svn path=/trunk/; revision=2966
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 36 |
2 files changed, 30 insertions, 13 deletions
@@ -1,3 +1,10 @@ +2008-04-15 Johan Dahlin <jdahlin@async.com.br> + + patch by: Johan Euphrosine <proppy@aminche.com> + + * configure.in: + Unbreak pango/cairo dependency chains (bug #528217) + 2008-03-24 Paul Pogonyshev <pogonyshev@gmx.net> * gtk/gdkevent.override (_wrap_gdk_event_tp_setattr): Fix several diff --git a/configure.in b/configure.in index 625daac0..f5e63970 100644 --- a/configure.in +++ b/configure.in @@ -178,7 +178,7 @@ PKG_CHECK_MODULES(PYCAIRO, [pycairo >= pycairo_required_version], have_pycairo=true, have_pycairo=false) AC_SUBST(PYCAIRO_CFLAGS) AC_SUBST(PYCAIRO_LIBS) -if test $have_pycairo; then +if test "x$have_pycairo" = "xtrue"; then PYGTK_CODEGEN_DEFINES="-DHAVE_PYCAIRO $PYGTK_CODEGEN_DEFINES"; AC_DEFINE([HAVE_PYCAIRO], [1], [Define to 1 if pycairo is available]) @@ -277,6 +277,16 @@ if test $have_pycairo; then else AC_MSG_RESULT(no) AC_MSG_RESULT(not checking for gtk due to missing pycairo) + AM_CONDITIONAL(BUILD_PANGOCAIRO, false) + AM_CONDITIONAL(BUILD_GTK, false) + AM_CONDITIONAL(HAVE_GTK_2_10, false) + AM_CONDITIONAL(HAVE_GTK_2_12, false) + AM_CONDITIONAL(BUILD_LIBGLADE, false) + AM_CONDITIONAL(BUILD_GTKUNIXPRINT, false) + have_pangocairo=false + have_gtk=false + have_libglade=false + have_gtkunixprint=false fi dnl Check for GDK target @@ -342,12 +352,12 @@ AC_OUTPUT echo echo "The following modules will be built:" echo -$have_atk && echo atk -$have_pango && echo pango -$have_pangocairo && echo pangocairo -$have_gtk && echo gtk with $gtk_version API -$have_libglade && echo gtk.glade -$have_gtkunixprint && echo gtk.unixprint +$have_atk && echo atk +$have_pango && echo pango +$have_pangocairo && echo pangocairo +$have_gtk && echo gtk with $gtk_version API +$have_libglade && echo gtk.glade +$have_gtkunixprint && echo gtk.unixprint echo if test ! $have_atk || ! $have_pango || \ @@ -355,10 +365,10 @@ if test ! $have_atk || ! $have_pango || \ ! $have_pangocairo || ! $have_gtkunixprint; then echo "The following modules will NOT be built:" echo - $have_atk || echo atk - $have_pango || echo pango - $have_pangocairo || echo pangocairo - $have_gtk || echo gtk - $have_libglade || echo gtk.glade - $have_gtkunixprint || echo gtk.unixprint + $have_atk || echo atk + $have_pango || echo pango + $have_pangocairo || echo pangocairo + $have_gtk || echo gtk + $have_libglade || echo gtk.glade + $have_gtkunixprint || echo gtk.unixprint fi |