/pidgin/main: cb3c2ebadbf1: When building with gtk 2, require at...
Mark Doliner
mark at kingant.net
Sat Jan 26 21:13:23 EST 2013
Changeset: cb3c2ebadbf14cff9cc60c135cb923572004f5c0
Author: Mark Doliner <mark at kingant.net>
Date: 2013-01-26 17:40 -0800
Branch: default
URL: http://hg.pidgin.im/pidgin/main/rev/cb3c2ebadbf1
Description:
When building with gtk 2, require at least 2.18.0
This should still allow building on RHEL6, according to
https://developer.pidgin.im/wiki/Dependencies
diffstat:
configure.ac | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (37 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -379,7 +379,7 @@ AC_ARG_ENABLE(consoleui, [AC_HELP_STRING
[enable_consoleui=$enableval force_finch=$enableval], [enable_consoleui=yes force_finch=no])
dnl #######################################################################
-dnl # Check for GTK+ 2.10 and other things used by the GTK UI
+dnl # Check for GTK+ 2.18 and other things used by the GTK UI
dnl #######################################################################
AC_ARG_ENABLE(screensaver,
[AC_HELP_STRING([--disable-screensaver],
@@ -439,20 +439,20 @@ Pidgin. If you want to build only Finch
running configure.
])])
elif test "x$with_gtk" = "x2"; then
- PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], , [
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.18.0], , [
AC_MSG_RESULT(no)
AC_MSG_ERROR([
-You must have GTK+ 2.10.0 or newer development headers installed to compile
+You must have GTK+ 2.18.0 or newer development headers installed to compile
Pidgin. If you want to build only Finch then specify --disable-gtkui when
running configure.
])])
elif test "x$with_gtk" = "xauto"; then
PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0.0], [with_gtk=3], [
AC_MSG_RESULT(no)
- PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], [with_gtk=2], [
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.18.0], [with_gtk=2], [
AC_MSG_RESULT(no)
AC_MSG_ERROR([
-You must have GTK+ 2.10.0 or newer development headers installed to compile
+You must have GTK+ 2.18.0 or newer development headers installed to compile
Pidgin. If you want to build only Finch then specify --disable-gtkui when
running configure.
])])])
More information about the Commits
mailing list