[gnumeric] Installation: make this work without scrollkeeper.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Installation: make this work without scrollkeeper.
- Date: Wed, 14 May 2014 13:52:26 +0000 (UTC)
commit 6900ef70821f2884edc18e11e2e0aa404a64f6e8
Author: Morten Welinder <terra gnome org>
Date: Wed May 14 09:51:53 2014 -0400
Installation: make this work without scrollkeeper.
Hopefully.
ChangeLog | 4 ++++
NEWS | 1 +
configure.ac | 3 +++
doc/gnumeric-doc.make | 2 +-
4 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 99fa074..3ca8377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-14 Morten Welinder <terra gnome org>
+
+ * configure.ac (scrollkeeper): Test if we have it.
+
2014-05-05 Morten Welinder <terra gnome org>
* src/wbc-gtk.c (toolbar_context_menu): Remove
diff --git a/NEWS b/NEWS
index 27eb3c2..143c75e 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Morten:
* Clean out old #ifdef.
* Fix ods series marker import/export.
* Fix plan-perfect issue. [Debian #748054]
+ * Make installtion work without scrollkeeper.
--------------------------------------------------------------------------
Gnumeric 1.12.15
diff --git a/configure.ac b/configure.ac
index e547569..7022d63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -885,6 +885,9 @@ AC_SUBST(GNM_PY_CFLAGS)
AC_SUBST(GNM_PY_LDFLAGS)
AC_SUBST(GNM_PY_LIBADD)
+AC_CHECK_PROG(SCROLLKEEPER_PREINSTALL,scrollkeeper-preinstall,yes,no)
+AM_CONDITIONAL(WITH_SCROLLKEEPER, test "x$SCROLLKEEPER_PREINSTALL" = xyes)
+
# Support for PDF docs
AC_ARG_ENABLE(pdfdocs,
AS_HELP_STRING([--enable-pdfdocs],[Generate documentation in Portable Document Format]),
diff --git a/doc/gnumeric-doc.make b/doc/gnumeric-doc.make
index 66f96b5..533ad4f 100644
--- a/doc/gnumeric-doc.make
+++ b/doc/gnumeric-doc.make
@@ -6,7 +6,7 @@
# Requires that the calling makefile define 'lang'
docname = gnumeric
-if !WITH_WIN32
+if WITH_SCROLLKEEPER
omffile = gnumeric-$(lang).omf
endif
gnumeric_docdir = $(top_srcdir)/doc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]