pidgin: 61c3e0d7: applied changes from c55cc517cc0bc09b677...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 61c3e0d7256d814aa9c60f91fa5f31c24c538f0d
Ancestor: 2fcdb38ca3b63c67c284de70a126b0c52b156fc2
Author: markdoliner at pidgin.im
Date: 2009-08-19T07:39:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/61c3e0d7256d814aa9c60f91fa5f31c24c538f0d

Modified files:
        configure.ac

ChangeLog: 

applied changes from c55cc517cc0bc09b677222a63f5f466531033719
             through 51ea62d1cdee93a0f6ab96f22d28cbe07ea5d13b

Plucked revision 51ea62d1cdee93a0f6ab96f22d28cbe07ea5d13b 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.

-------------- next part --------------
============================================================
--- configure.ac	bfd12c9ad4eb9caef1b67a37be401a73d31f7084
+++ configure.ac	25d35a51d820754c8e2468e3058657dcf4cd4c8b
@@ -312,11 +312,11 @@ dnl ####################################
 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 @@ if test "x$enable_gtkui" = "xyes" ; then
 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)