diff options
| author | jorn <jorn@b067294f-1dea-0310-9683-c47a78595994> | 2007-06-17 13:56:01 +0000 |
|---|---|---|
| committer | jorn <jorn@b067294f-1dea-0310-9683-c47a78595994> | 2007-06-17 13:56:01 +0000 |
| commit | 5b0a6e5214a69ba2c660242838526e56d5d8ee20 (patch) | |
| tree | 1ec0ac08f0a16847cfe93089f5ae028ea871192d | |
| parent | 2c185dcfbf399f9a6e661c76de5274dda7599749 (diff) | |
| download | matchbox-panel-2-5b0a6e5214a69ba2c660242838526e56d5d8ee20.tar.gz matchbox-panel-2-5b0a6e5214a69ba2c660242838526e56d5d8ee20.tar.bz2 matchbox-panel-2-5b0a6e5214a69ba2c660242838526e56d5d8ee20.zip | |
2007-06-17 Jorn Baayen <jorn@openedhand.com>
* applets/Makefile.am:
* configure.ac:
Don't build startup applet if libsn is not available.
Fixes #613.
git-svn-id: https://svn.o-hand.com/repos/matchbox/trunk/matchbox-panel-2@1569 b067294f-1dea-0310-9683-c47a78595994
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | applets/Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2007-06-17 Jorn Baayen <jorn@openedhand.com> + + * applets/Makefile.am: + * configure.ac: + + Don't build startup applet if libsn is not available. + Fixes #613. + 2007-06-14 Jorn Baayen <jorn@openedhand.com> * applets/startup/startup.c: diff --git a/applets/Makefile.am b/applets/Makefile.am index 077735c..1a7377a 100644 --- a/applets/Makefile.am +++ b/applets/Makefile.am @@ -1,7 +1,11 @@ -SUBDIRS = clock launcher startup systray showdesktop windowselector +SUBDIRS = clock launcher systray showdesktop windowselector if HAVE_LIBAPM SUBDIRS += battery endif +if HAVE_LIBSN + SUBDIRS += startup +endif + MAINTAINERCLEANFILES = Makefile.in diff --git a/configure.ac b/configure.ac index 80d5a8e..dd35515 100644 --- a/configure.ac +++ b/configure.ac @@ -26,11 +26,9 @@ if test x$enable_startup_notification != xno; then AC_MSG_ERROR([*** Required Startup Notification library not installed ***])) AC_DEFINE(USE_LIBSN, [1], [Has Startup Notification Support]) + AM_CONDITIONAL(HAVE_LIBSN, true) fi -AC_SUBST(SN_LIBS) -AC_SUBST(SN_CFLAGS) - # libnotify AC_ARG_ENABLE(libnotify, [ --enable-libnotify enable libnotify support], |