changeset
applied changes from 72b3be2a12aafc0f3b5367f8ca20a893422d36f6
Wed, 19 Aug 2009 07:39:52 +0000
- author
- Mark Doliner <markdoliner@pidgin.im>
- date
- Wed, 19 Aug 2009 07:39:52 +0000
- changeset 28285
- d288a79d7401
- parent 28284
- 5c623a812225
- child 28286
- ba3a8863dde2
applied changes from 72b3be2a12aafc0f3b5367f8ca20a893422d36f6
through 21feea24f3f388e265f362dc7f589bd0fbeef27a
Plucked revision 21feea24f3f388e265f362dc7f589bd0fbeef27a from im.pidgin.pidgin.2.6.1
Original commit message:
Make sure configure checks for glib and gtk 2.4.0, since that's what
is needed to compile. We took a small vote on IRC or in the
jabber room and we all thought it would be fine to do this rather
than try to make stuff work. We'll see how it goes.
| configure.ac | file | annotate | diff | comparison | revisions |
--- a/configure.ac Wed Aug 19 01:03:47 2009 +0000 +++ b/configure.ac Wed Aug 19 07:39:52 2009 +0000 @@ -312,11 +312,11 @@ dnl ####################################################################### dnl # Check for GLib 2.0 (required) dnl ####################################################################### -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [ +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.4.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [ AC_MSG_RESULT(no) AC_MSG_ERROR([ -You must have the GLib 2.0 development headers installed to build. +You must have GLib 2.4.0 or newer development headers installed to build. If you have these installed already you may need to install pkg-config so I can find them. @@ -399,12 +399,13 @@ fi if test "x$enable_gtkui" = "xyes" ; then - PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0], , [ + PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.4.0], , [ AC_MSG_RESULT(no) AC_MSG_ERROR([ -You must have the GTK+ 2.0 development headers installed to compile Pidgin. -If you want to build only Finch then specify --disable-gtkui when running configure. +You must have GTK+ 2.4.0 or newer development headers installed to compile +Pidgin. If you want to build only Finch then specify --disable-gtkui when +running configure. ])]) AC_SUBST(GTK_CFLAGS)
