diff options
| author | Stefano Karapetsas <[email protected]> | 2014-01-30 16:04:57 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-01-30 16:04:57 +0100 |
| commit | 8795f06d464700494234e589020e5e29854aeb8c (patch) | |
| tree | f2525b646023e533f03d5c80240563b89ab5b152 /configure.ac | |
| parent | c8a85a6aa040c1d2505b957af4cfb4bd39466504 (diff) | |
| parent | 064212a25bea1fcf8901cd0a1d55aae0899f627c (diff) | |
| download | mate-applets-8795f06d464700494234e589020e5e29854aeb8c.tar.bz2 mate-applets-8795f06d464700494234e589020e5e29854aeb8c.tar.xz | |
Merge branch 'dev-timer-applet'
Closes #45
https://github.com/mate-desktop/mate-applets/issues/45
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 02318101..ec379921 100644 --- a/configure.ac +++ b/configure.ac @@ -443,15 +443,6 @@ fi AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes") dnl *************************************************************************** -dnl *** Timer applet specific checks *** -dnl *************************************************************************** -AC_ARG_ENABLE([timer-applet], - AC_HELP_STRING([--enable-timer-applet], [Enable the timer applet.]), - enable_timerapplet=$enableval, - enable_timerapplet=no) -AM_CONDITIONAL(BUILD_TIMER_APPLET, test "x$enable_timerapplet" = "xyes") - -dnl *************************************************************************** dnl *** keyboard accessibility status applet check *** dnl *************************************************************************** @@ -548,6 +539,12 @@ AM_CONDITIONAL(BUILD_CPUFREQ_SELECTOR, test x$enable_selector = xyes) AM_CONDITIONAL(CPUFREQ_SELECTOR_SUID, test x$suid = xyes) dnl *************************************************************************** +dnl *** timerapplet specific checks *** +dnl *************************************************************************** + +AM_CONDITIONAL(BUILD_TIMERAPPLET, test "x$HAVE_LIBNOTIFY" = "xyes") + +dnl *************************************************************************** dnl *** invest-applet specific checks *** dnl *************************************************************************** @@ -703,14 +700,7 @@ cpufreq/src/Makefile cpufreq/src/cpufreq-selector/Makefile cpufreq/pixmaps/Makefile cpufreq/help/Makefile -timer-applet/Makefile -timer-applet/data/Makefile -timer-applet/images/Makefile -timer-applet/src/Makefile -timer-applet/src/timerapplet/Makefile -timer-applet/src/timerapplet/controllers/Makefile -timer-applet/src/timerapplet/core/Makefile -timer-applet/src/timerapplet/ui/Makefile +timerapplet/Makefile command/Makefile null_applet/Makefile ]) @@ -743,8 +733,8 @@ mate-applets-$VERSION configure summary: - modemlights $BUILD_MODEM_LIGHTS - multiload $build_gtop_applets - stickynotes $enable_stickynotes + - timerapplet $HAVE_LIBNOTIFY - trashapplet always - - timer-applet $enable_timerapplet Using DBUS: $HAVE_DBUS Using NetworkManager: $HAVE_NETWORKMANAGER |