diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2020-09-24 01:31:17 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2020-09-24 01:31:17 (GMT) |
| commit | e049c3455038b91b6d18a840d4d0393c81519f84 (patch) | |
| tree | f73e4b2a3a265519e962e14982270d3edaaca060 /unix | |
| parent | 08ada7da6ce675925377b919a18a3316c5e82a2d (diff) | |
| download | tk-e049c3455038b91b6d18a840d4d0393c81519f84.zip tk-e049c3455038b91b6d18a840d4d0393c81519f84.tar.gz tk-e049c3455038b91b6d18a840d4d0393c81519f84.tar.bz2 | |
More tweaks to configure to find glib
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 12 | ||||
| -rw-r--r-- | unix/configure.ac | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/unix/configure b/unix/configure index e35fe25..5569e46 100755 --- a/unix/configure +++ b/unix/configure @@ -7827,7 +7827,7 @@ fi # Check for libnotify. #-------------------------------------------------------------------- -if test $tk_aqua = no; then +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. @@ -7848,8 +7848,10 @@ $as_echo "$enable_libnotify" >&6; } 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" + GLIB_CFLAGS=`pkg-config --cflags glib-2.0 2>/dev/null` || found_libnotify="no" + GLIB_LIBS=`pkg-config --libs glib-2.0 2>/dev/null` || found_libnotify="no" if test "$found_libnotify" = "no" ; then - found_libnotify=yes + 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" GLIB_CFLAGS=`pkg-config --cflags glib-2.0 2>/dev/null` || found_libnotify="no" @@ -7858,12 +7860,12 @@ $as_echo "$enable_libnotify" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_libnotify" >&5 $as_echo "$found_libnotify" >&6; } fi - if test $enable_libnotify = "yes" ; then + if test "$enable_libnotify" = "yes" ; then UNIX_LIBNOTIFY_OBJS=tkUnixSysnotify.o tk_oldCFlags=$CFLAGS - CFLAGS="$CFLAGS $LIBNOTIFY_CFLAGS $GLIB_CFLAGS" + CFLAGS="$tk_oldCFlags $LIBNOTIFY_CFLAGS $GLIB_CFLAGS" tk_oldLibs=$LIBS - LIBS="$tk_oldLIBS $LIBNOTIFY_LIBS $GLIB_LIBS" + LIBS="$tk_oldLibs $LIBNOTIFY_LIBS $GLIB_LIBS" $as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h diff --git a/unix/configure.ac b/unix/configure.ac index fc3b8b9..25eb7a0 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -523,7 +523,7 @@ fi # Check for libnotify. #-------------------------------------------------------------------- -if test $tk_aqua = no; then +if test $tk_aqua = "no" ; then AC_MSG_CHECKING([whether to use libnotify]) AC_ARG_ENABLE(libnotify, AC_HELP_STRING([--enable-libnotify], @@ -540,8 +540,10 @@ if test $tk_aqua = no; then dnl make sure pkg-config says that libnotify is present. LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no" LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no" + GLIB_CFLAGS=`pkg-config --cflags glib-2.0 2>/dev/null` || found_libnotify="no" + GLIB_LIBS=`pkg-config --libs glib-2.0 2>/dev/null` || found_libnotify="no" if test "$found_libnotify" = "no" ; then - found_libnotify=yes + 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" GLIB_CFLAGS=`pkg-config --cflags glib-2.0 2>/dev/null` || found_libnotify="no" @@ -549,12 +551,12 @@ if test $tk_aqua = no; then fi AC_MSG_RESULT([$found_libnotify]) fi - if test $enable_libnotify = "yes" ; then + if test "$enable_libnotify" = "yes" ; then UNIX_LIBNOTIFY_OBJS=tkUnixSysnotify.o tk_oldCFlags=$CFLAGS - CFLAGS="$CFLAGS $LIBNOTIFY_CFLAGS $GLIB_CFLAGS" + CFLAGS="$tk_oldCFlags $LIBNOTIFY_CFLAGS $GLIB_CFLAGS" tk_oldLibs=$LIBS - LIBS="$tk_oldLIBS $LIBNOTIFY_LIBS $GLIB_LIBS" + LIBS="$tk_oldLibs $LIBNOTIFY_LIBS $GLIB_LIBS" AC_DEFINE(HAVE_LIBNOTIFY, 1, [Have we turned on libnotify?]) else UNIX_LIBNOTIFY_OBJS="" |