diff options
| author | Michael Vetter <jubalh@iodoru.org> | 2019-10-29 14:31:17 +0100 |
|---|---|---|
| committer | Michael Vetter <jubalh@iodoru.org> | 2019-10-29 15:20:57 +0100 |
| commit | 900a0451a7b7cab6af3826134b623560c0452fe6 (patch) | |
| tree | ec42e3f889b5fd21baf868903aabe0c8eae6476d | |
| parent | b46dbcc3633cd28411e3a301d7082098699e85ca (diff) | |
| download | profani-tty-900a0451a7b7cab6af3826134b623560c0452fe6.tar.gz | |
Adjust tray configure switch to also include clipboard
General GTK.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index bafe4dfc..c49b6ba6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ @@ -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 \ diff --git a/configure.ac b/configure.ac index 52a19dc1..63eae494 100644 --- a/configure.ac +++ b/configure.ac @@ -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 @@ -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], |