diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2020-09-21 01:44:05 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2020-09-21 01:44:05 (GMT) |
| commit | 73dfca5e7834838008689bc303a0f89b4d7edc1f (patch) | |
| tree | 92b49054a4401d7775a4df00182f581051eb13bc | |
| parent | b1e85160447c48e1dada3e5718b5ce9121231f2c (diff) | |
| download | tk-73dfca5e7834838008689bc303a0f89b4d7edc1f.zip tk-73dfca5e7834838008689bc303a0f89b4d7edc1f.tar.gz tk-73dfca5e7834838008689bc303a0f89b4d7edc1f.tar.bz2 | |
Merge trunk
| -rwxr-xr-x | unix/configure | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/unix/configure b/unix/configure index 13c36a9..e39c8b6 100755 --- a/unix/configure +++ b/unix/configure @@ -663,6 +663,9 @@ TK_MAJOR_VERSION TK_VERSION TK_DEMO_DIR DEMO_DIR +UNIX_LIBNOTIFY_OBJS +LIBNOTIFY_LIBS +LIBNOTIFY_CFLAGS UNIX_FONT_OBJS XFT_LIBS XFT_CFLAGS @@ -778,6 +781,7 @@ enable_symbols enable_aqua with_x enable_xft +enable_libnotify enable_xss enable_framework ' @@ -1421,6 +1425,7 @@ Optional Features: --enable-symbols build with debugging symbols (default: off) --enable-aqua=yes|no use Aqua windowingsystem on Mac OS X (default: no) --enable-xft use freetype/fontconfig/xft (default: on) + --enable-libnotify use libnotify (default: on) --enable-xss use XScreenSaver for activity timer (default: on) --enable-framework package shared libraries in MacOSX frameworks (default: off) @@ -7817,6 +7822,50 @@ $as_echo "#define HAVE_XFT 1" >>confdefs.h fi #-------------------------------------------------------------------- +# Check for libnotify. +#-------------------------------------------------------------------- + +if test $tk_aqua = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use libnotify" >&5 +$as_echo_n "checking whether to use libnotify... " >&6; } + # Check whether --enable-libnotify was given. +if test "${enable_libnotify+set}" = set; then : + enableval=$enable_libnotify; enable_libnotify=$enableval +else + enable_libfnotify="default" +fi + + LIBNOTIFY_CFLAGS="" + LIBNOTIFY_LIBS="" + if test "$enable_libnotify" = "no" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libnotify" >&5 +$as_echo "$enable_libnotify" >&6; } + else + found_libnotify="yes" + LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no" + LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no" + if test "$found_libnotify" = "no" ; then + found_libnotify=yes + LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no" + LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_libnotify" >&5 +$as_echo "$found_libnotify" >&6; } + fi + if test $enable_libnotify = "yes" ; then + UNIX_LIBNOTIFY_OBJS=tkUnixSysnotify.o + +$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h + + else + UNIX_LIBNOTIFY_OBJS="" + fi + + + +fi + +#-------------------------------------------------------------------- # XXX Do this last. # It might modify XLIBSW which could affect other tests. # |