[gnumeric] Configuration: Always compile ssconvert, ssindex, and ssgrep.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Configuration: Always compile ssconvert, ssindex, and ssgrep.
- Date: Mon, 24 Dec 2012 18:36:03 +0000 (UTC)
commit 8e196fb17ce4eca07626f8d66a23eb7eee7ba0fc
Author: Morten Welinder <terra gnome org>
Date: Mon Dec 24 13:33:56 2012 -0500
Configuration: Always compile ssconvert, ssindex, and ssgrep.
This configurability was always silly. For ssconvert it was also wrong:
we need it for the tests.
If someone doesn't want these, he/she can simply not install them.
ChangeLog | 6 ++++++
NEWS | 1 +
configure.in | 15 ---------------
doc/C/Makefile.am | 14 +-------------
src/Makefile.am | 11 +----------
5 files changed, 9 insertions(+), 38 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4d351ef..717a9e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-24 Morten Welinder <terra gnome org>
+
+ * configure.in: ssconvert, ssindex, and ssgrep are no longer
+ configurable. We need ssconvert for the test and it's silly
+ anyway.
+
2012-12-18 Morten Welinder <terra gnome org>
* configure.in: Post-release bump.
diff --git a/NEWS b/NEWS
index 0e47884..6755c35 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Andreas:
Morten:
* Fix a few compiler warnings.
+ * Always compile ssconvert, ssindex, and ssgrep.
* New utility: ssdiff.
--------------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index 89be132..0ec96e9 100644
--- a/configure.in
+++ b/configure.in
@@ -293,21 +293,6 @@ if test "$GCC" = yes -a "x$set_more_warnings" != xno; then
fi
AC_SUBST(WARN_CFLAGS)
-AC_ARG_ENABLE(ssconvert,
- AS_HELP_STRING([--disable-ssconvert], [Do not build ssconvert (command line spreadsheet conversion tool)]),
- [], [enable_ssconvert=yes])
-AM_CONDITIONAL(ENABLE_SSCONVERT, test x"$enable_ssconvert" = xyes)
-
-AC_ARG_ENABLE(ssindex,
- AS_HELP_STRING([--disable-ssindex], [Do not build ssindex (spreadsheet indexer for beagle)]),
- [], [enable_ssindex=yes])
-AM_CONDITIONAL(ENABLE_SSINDEX, test x"$enable_ssindex" = xyes)
-
-AC_ARG_ENABLE(ssgrep,
- AS_HELP_STRING([--disable-ssgrep], [Do not build ssgrep (search for supplied strings in spreadsheet)]),
- [], [enable_ssgrep=yes])
-AM_CONDITIONAL(ENABLE_SSGREP, test x"$enable_ssgrep" = xyes)
-
AC_ARG_ENABLE(component,
AS_HELP_STRING([--disable-component], [Do not build the goffice component]),
[], [enable_component=yes])
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 1c32538..5cf14b2 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -76,19 +76,7 @@ figdir = figures
include $(top_srcdir)/doc/gnumeric-doc.make
manpagedir = $(mandir)/man1
-manpage_DATA = gnumeric.1
-
-if ENABLE_SSCONVERT
-manpage_DATA += ssconvert.1
-endif
-
-if ENABLE_SSINDEX
-manpage_DATA += ssindex.1
-endif
-
-if ENABLE_SSGREP
-manpage_DATA += ssgrep.1
-endif
+manpage_DATA = gnumeric.1 ssconvert.1 ssindex.1 ssgrep.1
winhelp_DATA =
winhelpdir=$(gnumeric_datadir)/$(subdir)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5bd810c..ee26799 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,16 +28,7 @@ if WITH_GTK
check_PROGRAMS += test-pango
endif
-if ENABLE_SSCONVERT
- bin_PROGRAMS += ssconvert
-endif
-if ENABLE_SSINDEX
- bin_PROGRAMS += ssindex
-endif
-if ENABLE_SSGREP
- bin_PROGRAMS += ssgrep
-endif
-bin_PROGRAMS += ssdiff
+bin_PROGRAMS += ssconvert ssindex ssgrep ssdiff
AM_CPPFLAGS = \
-I$(top_srcdir) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]