Commit f3eb0a19 authored by Morten Welinder's avatar Morten Welinder

Solver: missed some conditionals last time.

parent 39e22ab7
......@@ -42,7 +42,7 @@ if test `expr gnumeric_version_major % 2` -eq 1; then
gnumeric_api_ver=gnumeric_version_epoch.`expr gnumeric_version_major + 1`
dnl An explicit version number should be used in place of the above
dnl if the epoch is to change.
dnl gnumeric_api_ver=2_0
dnl gnumeric_api_ver=2.0
else
gnumeric_devel=no
gnumeric_api_ver=gnumeric_version_epoch.gnumeric_version_major
......
......@@ -19,8 +19,6 @@
#undef GNM_WITH_GTK
/* Define if the long double type is to be used */
#undef GNM_WITH_LONG_DOUBLE
/* Define if SOLVER is compiled */
#undef GNM_ENABLE_SOLVER
/* Define to 1 if you have the <ieeefp.h> header file. */
#undef HAVE_IEEEFP_H
......
......@@ -935,12 +935,7 @@ static GNM_ACTION_DEF (cb_tools_goal_seek) { dialog_goal_seek (wbcg, wbcg_cur_sh
static GNM_ACTION_DEF (cb_tools_tabulate) { dialog_tabulate (wbcg, wbcg_cur_sheet (wbcg)); }
static GNM_ACTION_DEF (cb_tools_merge) { dialog_merge (wbcg); }
static GNM_ACTION_DEF (cb_tools_solver)
{
#ifdef GNM_ENABLE_SOLVER
dialog_solver (wbcg, wbcg_cur_sheet (wbcg));
#endif
}
static GNM_ACTION_DEF (cb_tools_solver) { dialog_solver (wbcg, wbcg_cur_sheet (wbcg)); }
static GNM_ACTION_DEF (cb_tools_scenario_add) { dialog_scenario_add (wbcg); }
static GNM_ACTION_DEF (cb_tools_scenarios) { dialog_scenarios (wbcg); }
......
......@@ -5731,9 +5731,7 @@ wbc_gtk_init (GObject *obj)
wbcg_set_autosave_time (wbcg, gnm_conf_get_core_workbook_autosave_time ());
#ifndef GNM_ENABLE_SOLVER
wbc_gtk_set_action_sensitivity (wbcg, "ToolsSolver", FALSE);
#endif
if (gnm_debug_flag ("actions")) {
list_actions (wbcg->permanent_actions);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment