[gnote] * Output options at the end of configure and fail if D-Bus is enabled.
- From: Hubert Figuière <hub src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnote] * Output options at the end of configure and fail if D-Bus is enabled.
- Date: Mon, 4 May 2009 22:44:07 -0400 (EDT)
commit 30fab8717470e7125b0f970543e9f58c180c2903
Author: Hubert Figuiere <hub figuiere net>
Date: Mon May 4 22:03:47 2009 -0400
* Output options at the end of configure and fail if D-Bus is enabled.
---
NEWS | 1 +
configure.ac | 18 +++++++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/NEWS b/NEWS
index d7f1e62..3959322 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Fixes:
* Notebook addin toolbar button was inconsistent. (Closes #581213)
* Delete notebook now works in the search dialog. (Closes #581222)
* Popup menus in the search dialog now appear.
+ * Output options at the end of configure and fail if D-Bus is enabled.
Translations:
diff --git a/configure.ac b/configure.ac
index 7a1535c..6c8874a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,13 +89,13 @@ AC_CHECK_LIB(uuid,uuid_unparse_lower, ,[AC_MSG_ERROR("libuuid library is missing
PKG_CHECK_EXISTS(libpanelappletmm-2.6 >= $LIBPANELAPPLETMM_VERSION,
[
AC_DEFINE(HAVE_PANELAPPLETMM, 1, [Define to 1 if panelapplet is available])
- have_panelapplet=1
+ have_panelapplet="yes"
PKG_CHECK_MODULES(LIBPANELAPPLETMM, [libpanelappletmm-2.6 >= $LIBPANELAPPLETMM_VERSION])
],
- [have_panelapplet=0]
+ [have_panelapplet="no"]
)
-AM_CONDITIONAL(HAVE_PANELAPPLETMM, test $have_panelapplet == "1")
+AM_CONDITIONAL(HAVE_PANELAPPLETMM, test $have_panelapplet == "yes")
#
# If libpanelapplet available, use it to find .server install location.
@@ -162,6 +162,9 @@ AC_ARG_ENABLE(dbus,
[ --enable-dbus[[=no/yes]] compile with dbus support [[default: no]]],
ENABLE_DBUS="$enableval", ENABLE_DBUS="no")
AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" != "xno")
+if test "x$ENABLE_DBUS" != "xno"; then
+ AC_ERROR("DBus support not implemented yet");
+fi
AC_ARG_WITH(dbus_service_dir, [ --with-dbus-service-dir=DIR Where to install Gnote's DBus service file.])
AM_CONDITIONAL(WITH_DBUS_SERVICE_DIR, test "x$with_dbus_service_dir" != "x")
@@ -216,3 +219,12 @@ help/Makefile
AC_OUTPUT
+
+
+echo "
+Options:
+
+ Spellchecking support: ${FIXED_GTKSPELL}
+ GNOME Panel Appplet support: ${have_panelapplet}
+
+"
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]