[gnumeric] Solver: unconditionally enable.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Solver: unconditionally enable.
- Date: Thu, 28 Feb 2013 17:28:03 +0000 (UTC)
commit 91cde14b2f21d40660598eaebfc4b046f7c280dd
Author: Morten Welinder <terra gnome org>
Date: Thu Feb 28 12:27:48 2013 -0500
Solver: unconditionally enable.
ChangeLog | 2 ++
NEWS | 1 +
configure.ac | 14 --------------
plugins/Makefile.am | 8 ++------
src/dialogs/Makefile.am | 7 +------
5 files changed, 6 insertions(+), 26 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2f7f524..c794f11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
* configure.ac: remove the DISABLE_DEPRECATED defines even from
development versions. We now get the information through gcc
warnings.
+ (solver): Make solver code unconditional. Feel free to not
+ distribute the relevant plugins.
2013-02-26 Morten Welinder <terra gnome org>
diff --git a/NEWS b/NEWS
index f094c79..8c3427f 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,7 @@ Morten:
* FreeBSD portability fix. [#693761]
* Introspection fixes.
* Fix ssconvert crash. [#694741]
+ * Unconditionally enable solver.
--------------------------------------------------------------------------
Gnumeric 1.12.0
diff --git a/configure.ac b/configure.ac
index 8b7c29c..49dee70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,11 +379,6 @@ if test $struct_timeval_works = no ; then
fi
fi
-AC_CHECK_FUNC(gettimeofday,
- [AC_DEFINE(HAVE_GETTIMEOFDAY, 1,
- [Define if the gettimeofday function is available]
- )])
-
dnl src/functions/fn-math.c uses M_PI
AC_MSG_CHECKING([whether M_PI is available])
@@ -491,15 +486,6 @@ AM_CONDITIONAL(WITH_PARADOX, $enable_paradox)
AC_SUBST(PARADOX_LIBS)
AC_SUBST(PARADOX_CFLAGS)
-AC_ARG_ENABLE(solver, AS_HELP_STRING([--disable-solver], [Don't compile the solver]))
-if test "x$enable_solver" = xno; then
- enable_solver=false
-else
- enable_solver=true
- AC_DEFINE(GNM_ENABLE_SOLVER, 1, [Define if SOLVER is compiled])
-fi
-AM_CONDITIONAL(ENABLE_SOLVER, $enable_solver)
-
plugin_list_given=false
PLUGIN_LIST=""
AC_ARG_ENABLE(plugins,
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index e88ac33..3c895b4 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,18 +1,14 @@
SUBDIRS_FILE_FORMATS = excel lotus-123 oleo sc sylk xbase html dif qpro \
- plan-perfect applix openoffice
+ plan-perfect applix openoffice mps
SUBDIRS_FUNCTIONS = fn-numtheory fn-christian-date fn-database fn-date \
fn-eng fn-erlang \
fn-financial fn-hebrew-date fn-info fn-logical fn-complex fn-lookup \
fn-math fn-r fn-stat fn-string fn-random fn-tsa fn-derivatives
SUBDIRS_LOADERS = excelplugins
SUBDIRS_DATA_SOURCES = sample_datasource
-SUBDIRS_SOLVERS =
+SUBDIRS_SOLVERS = nlsolve lpsolve glpk
SUBDIRS_EXAMPLES = uihello
-if ENABLE_SOLVER
- SUBDIRS_FILE_FORMATS += mps lpsolve glpk
- SUBDIRS_SOLVERS += nlsolve
-endif
if WITH_PSICONV
SUBDIRS_FILE_FORMATS += psiconv
endif
diff --git a/src/dialogs/Makefile.am b/src/dialogs/Makefile.am
index 19d076c..121c004 100644
--- a/src/dialogs/Makefile.am
+++ b/src/dialogs/Makefile.am
@@ -2,13 +2,8 @@
# Keep this in sync with ../../icons/Makefile.am
#
-libdialogs_la_SOURCES = $(base_files)
nodist_libdialogs_la_SOURCES = embedded-ui.c
-if ENABLE_SOLVER
- libdialogs_la_SOURCES += dialog-solver.c
-endif
-
AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGNUMERIC_DATADIR=\""$(gnumeric_datadir)"\" \
@@ -20,7 +15,7 @@ AM_CPPFLAGS = \
noinst_LTLIBRARIES = libdialogs.la
-base_files = \
+libdialogs_la_SOURCES = \
help.h \
dao-gui-utils.c \
dao-gui-utils.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]