comparison: configure.ac
configure.ac
- branch
- cpw.qulogic.gtk3-required
- changeset 33138
- 7e7aeaa31dfe
- parent 32987
- cdf1e8c4203c
- parent 33128
- 88ee8f3bfff3
- child 33160
- 4ddceddab409
equal
deleted
inserted
replaced
| 32987:cdf1e8c4203c | 33138:7e7aeaa31dfe |
|---|---|
| 426 else | 426 else |
| 427 x_incpath_add="-I$x_includes" | 427 x_incpath_add="-I$x_includes" |
| 428 fi | 428 fi |
| 429 | 429 |
| 430 if test "x$enable_gtkui" = "xyes" ; then | 430 if test "x$enable_gtkui" = "xyes" ; then |
| 431 PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], , [ | 431 PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0.0], , [ |
| 432 AC_MSG_RESULT(no) | 432 AC_MSG_RESULT(no) |
| 433 AC_MSG_ERROR([ | 433 AC_MSG_ERROR([ |
| 434 | 434 |
| 435 You must have GTK+ 2.10.0 or newer development headers installed to compile | 435 You must have GTK+ 3.0.0 or newer development headers installed to compile |
| 436 Pidgin. If you want to build only Finch then specify --disable-gtkui when | 436 Pidgin. If you want to build only Finch then specify --disable-gtkui when |
| 437 running configure. | 437 running configure. |
| 438 ])]) | 438 ])]) |
| 439 | 439 |
| 440 AC_SUBST(GTK_CFLAGS) | 440 AC_SUBST(GTK_CFLAGS) |
| 442 | 442 |
| 443 dnl We only really need Pango >= 1.4 for decent RTL support | 443 dnl We only really need Pango >= 1.4 for decent RTL support |
| 444 PKG_CHECK_MODULES(PANGO, [pango >= 1.4.0], | 444 PKG_CHECK_MODULES(PANGO, [pango >= 1.4.0], |
| 445 AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:) | 445 AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:) |
| 446 | 446 |
| 447 PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= 1.1.1], , [ | 447 PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= 1.1.1], , [ |
| 448 AC_MSG_RESULT(no) | 448 AC_MSG_RESULT(no) |
| 449 AC_MSG_ERROR([ | 449 AC_MSG_ERROR([ |
| 450 You must have WebKit 1.1.1 or newer development headers installed to compile | 450 You must have WebKit 1.1.1 or newer development headers installed to compile |
| 451 Pidgin. If you want to build only Finch then specify --disable-gtkui when | 451 Pidgin. If you want to build only Finch then specify --disable-gtkui when |
| 452 running configure. | 452 running configure. |
| 563 fi | 563 fi |
| 564 | 564 |
| 565 dnl ####################################################################### | 565 dnl ####################################################################### |
| 566 dnl # Check for GtkSpell | 566 dnl # Check for GtkSpell |
| 567 dnl ####################################################################### | 567 dnl ####################################################################### |
| 568 dnl GtkSpell is not GTK+3 compatible yet | |
| 569 enable_gtkspell="no" | |
| 568 if test "x$enable_gtkspell" = "xyes" ; then | 570 if test "x$enable_gtkspell" = "xyes" ; then |
| 569 PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, , [ | 571 PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, , [ |
| 570 AC_MSG_RESULT(no) | 572 AC_MSG_RESULT(no) |
| 571 enable_gtkspell="no" | 573 enable_gtkspell="no" |
| 572 if test "x$force_deps" = "xyes" ; then | 574 if test "x$force_deps" = "xyes" ; then |
| 627 | 629 |
| 628 dnl ####################################################################### | 630 dnl ####################################################################### |
| 629 dnl # Check for GCR for its certificate widgets | 631 dnl # Check for GCR for its certificate widgets |
| 630 dnl ####################################################################### | 632 dnl ####################################################################### |
| 631 if test "x$enable_gcr" = "xyes"; then | 633 if test "x$enable_gcr" = "xyes"; then |
| 632 PKG_CHECK_MODULES(GCR, gcr-0, [ | 634 PKG_CHECK_MODULES(GCR, gcr-3, [ |
| 633 AC_DEFINE(ENABLE_GCR, 1, [Define to 1 if GCR is found.])], [ | 635 AC_DEFINE(ENABLE_GCR, 1, [Define to 1 if GCR is found.])], [ |
| 634 AC_MSG_RESULT(no) | 636 AC_MSG_RESULT(no) |
| 635 enable_gcr="no" | 637 enable_gcr="no" |
| 636 if test "x$force_deps" = "xyes" ; then | 638 if test "x$force_deps" = "xyes" ; then |
| 637 AC_MSG_ERROR([ | 639 AC_MSG_ERROR([ |
