pidgin.2.6.1: 51ea62d1: Make sure configure checks for glib and ...

markdoliner at pidgin.im markdoliner at pidgin.im
Wed Aug 19 03:25:46 EDT 2009


-----------------------------------------------------------------
Revision: 51ea62d1cdee93a0f6ab96f22d28cbe07ea5d13b
Ancestor: c55cc517cc0bc09b677222a63f5f466531033719
Author: markdoliner at pidgin.im
Date: 2009-08-19T07:23:58
Branch: im.pidgin.pidgin.2.6.1
URL: http://d.pidgin.im/viewmtn/revision/info/51ea62d1cdee93a0f6ab96f22d28cbe07ea5d13b

Modified files:
        configure.ac

ChangeLog: 

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	044e70ea851d7d9e43421afc6867436287f71412
+++ configure.ac	5941e5c7b4ee8fb34f13c7f539fe7a4c374ef3b3
@@ -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)


More information about the Commits mailing list