From 05d19cb6e34baf2a1a82edf8f40f54d4b881c42e Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 4 Aug 2020 18:05:04 +0200 Subject: [PATCH] configure: support gtk3 too Make Profanity compilable with gtk2 and gtk3. Prefer the latter. --- configure.ac | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 96281bed..19f51764 100644 --- a/configure.ac +++ b/configure.ac @@ -208,11 +208,13 @@ PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.22.0], [], [AC_MSG_ERROR([sqlite3 3.22.0 or higher is required for profanity])]) AS_IF([test "x$enable_icons_and_clipboard" != xno], - [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10], + [PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.24.0], [AC_DEFINE([HAVE_GTK], [1], [libgtk module])], [AS_IF([test "x$enable_icons_and_clipboard" = xyes], - [AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])], - [AC_MSG_NOTICE([gtk+-2.0 not found, icons and clipboard not enabled])])])]) + [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10], + [AC_DEFINE([HAVE_GTK], [1], [libgtk module])], + [AC_MSG_ERROR([gtk+-2.0 >= 2.24.10 or gtk+-3.0 >= 3.24.0 is required for icons and clipboard])], + [AC_MSG_NOTICE([gtk+-3.0/gtk+2.0 not found, icons and clipboard not enabled])])])])]) AS_IF([test "x$PLATFORM" = xosx], [AC_CHECK_FILE([/usr/local/opt/readline/lib],