aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Adjust tray configure switch to also include clipboard

Browse Source 
General GTK.
This commit is contained in:
Michael Vetter 2019-10-29 14:31:17 +01:00
parent b46dbcc363
commit 900a0451a7
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -41,6 +41,7 @@ core_sources = \
src/tools/http_upload.h \ src/tools/http_upload.h \
src/tools/autocomplete.c src/tools/autocomplete.h \ src/tools/autocomplete.c src/tools/autocomplete.h \
src/tools/tinyurl.c src/tools/tinyurl.h \ src/tools/tinyurl.c src/tools/tinyurl.h \
src/tools/clipboard.c src/tools/clipboard.h \
src/config/files.c src/config/files.h \ src/config/files.c src/config/files.h \
src/config/conflists.c src/config/conflists.h \ src/config/conflists.c src/config/conflists.h \
src/config/accounts.c src/config/accounts.h \ src/config/accounts.c src/config/accounts.h \
@ -81,6 +82,7 @@ unittest_sources = \
src/tools/parser.h \ src/tools/parser.h \
src/tools/autocomplete.c src/tools/autocomplete.h \ src/tools/autocomplete.c src/tools/autocomplete.h \
src/tools/tinyurl.c src/tools/tinyurl.h \ src/tools/tinyurl.c src/tools/tinyurl.h \
src/tools/clipboard.c src/tools/clipboard.h \
src/config/accounts.h \ src/config/accounts.h \
src/config/account.c src/config/account.h \ src/config/account.c src/config/account.h \
src/config/files.c src/config/files.h \ src/config/files.c src/config/files.h \

10
configure.ac
View File

@ -66,8 +66,8 @@ AC_ARG_WITH([xscreensaver],
[AS_HELP_STRING([--with-xscreensaver], [use libXScrnSaver to determine idle time])]) [AS_HELP_STRING([--with-xscreensaver], [use libXScrnSaver to determine idle time])])
AC_ARG_WITH([themes], AC_ARG_WITH([themes],
[AS_HELP_STRING([--with-themes[[=PATH]]], [install themes (default yes)])]) [AS_HELP_STRING([--with-themes[[=PATH]]], [install themes (default yes)])])
AC_ARG_ENABLE([icons], AC_ARG_ENABLE([icons-and-clipboard],
[AS_HELP_STRING([--enable-icons], [enable GTK tray icons])]) [AS_HELP_STRING([--enable-icons-and-clipboard], [enable GTK tray icons and clipboard paste support])])
### plugins ### plugins
@ -172,12 +172,12 @@ PKG_CHECK_MODULES([curl], [libcurl], [],
[AC_CHECK_LIB([curl], [main], [], [AC_CHECK_LIB([curl], [main], [],
[AC_MSG_ERROR([libcurl is required for profanity])])]) [AC_MSG_ERROR([libcurl is required for profanity])])])
AS_IF([test "x$enable_icons" != xno], AS_IF([test "x$enable_icons_and_clipboard" != xno],
[PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10], [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10],
[AC_DEFINE([HAVE_GTK], [1], [libgtk module])], [AC_DEFINE([HAVE_GTK], [1], [libgtk module])],
[AS_IF([test "x$enable_icons" = xyes], [AS_IF([test "x$enable_icons_and_clipboard" = xyes],
[AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])], [AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])],
[AC_MSG_NOTICE([gtk+-2.0 not found, icons not enabled])])])]) [AC_MSG_NOTICE([gtk+-2.0 not found, icons and clipboard not enabled])])])])
AS_IF([test "x$PLATFORM" = xosx], AS_IF([test "x$PLATFORM" = xosx],
[AC_CHECK_FILE([/usr/local/opt/readline/lib], [AC_CHECK_FILE([/usr/local/opt/readline/lib],