Skip to content

Commit

Permalink
Adjust tray configure switch to also include clipboard
Browse files Browse the repository at this point in the history
General GTK.
  • Loading branch information
jubalh committed Oct 29, 2019
1 parent b46dbcc commit 900a045
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ core_sources = \
src/tools/http_upload.h \
src/tools/autocomplete.c src/tools/autocomplete.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/conflists.c src/config/conflists.h \
src/config/accounts.c src/config/accounts.h \
Expand Down Expand Up @@ -81,6 +82,7 @@ unittest_sources = \
src/tools/parser.h \
src/tools/autocomplete.c src/tools/autocomplete.h \
src/tools/tinyurl.c src/tools/tinyurl.h \
src/tools/clipboard.c src/tools/clipboard.h \
src/config/accounts.h \
src/config/account.c src/config/account.h \
src/config/files.c src/config/files.h \
Expand Down
10 changes: 5 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ AC_ARG_WITH([xscreensaver],
[AS_HELP_STRING([--with-xscreensaver], [use libXScrnSaver to determine idle time])])
AC_ARG_WITH([themes],
[AS_HELP_STRING([--with-themes[[=PATH]]], [install themes (default yes)])])
AC_ARG_ENABLE([icons],
[AS_HELP_STRING([--enable-icons], [enable GTK tray icons])])
AC_ARG_ENABLE([icons-and-clipboard],
[AS_HELP_STRING([--enable-icons-and-clipboard], [enable GTK tray icons and clipboard paste support])])

### plugins

Expand Down Expand Up @@ -172,12 +172,12 @@ PKG_CHECK_MODULES([curl], [libcurl], [],
[AC_CHECK_LIB([curl], [main], [],
[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],
[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_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],
[AC_CHECK_FILE([/usr/local/opt/readline/lib],
Expand Down

0 comments on commit 900a045

Please sign in to comment.