aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a858f2..158f767 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-11 Ross Burton <ross@openedhand.com>
+
+ * configure.ac:
+ Use AC_HELP_STRING, make the help output reflect reality, and fix
+ building without libstartup-notification.
+
2007-08-08 Rob Bradford <rob@openedhand.com>
* applets/showdesktop/Makefile.am:
diff --git a/configure.ac b/configure.ac
index dd35515..5f2b751 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ PKG_CHECK_MODULES(MATCHBOX_PANEL,
# startup-notification
AC_ARG_ENABLE(startup_notification,
- [ --enable-startup-notification enable startup notification support],
+ AC_HELP_STRING([--disable-startup-notification], [disable startup notification support]),
enable_startup_notification=$enableval, enable_startup_notification=yes )
if test x$enable_startup_notification != xno; then
@@ -26,12 +26,12 @@ 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
+AM_CONDITIONAL(HAVE_LIBSN, test x$enable_startup_notification = xyes)
# libnotify
AC_ARG_ENABLE(libnotify,
- [ --enable-libnotify enable libnotify support],
+ AC_HELP_STRING([--disable-libnotify], [disable libnotifysupport]),
enable_libnotify=$enableval, enable_libnotify=yes )
if test x$enable_libnotify != xno; then