[gnumeric] Solver: missed some conditionals last time.

[Morten Welinder <mortenw src gnome org>]

commit f3eb0a19a6404d87f7b68efb9c70977f76d0aa84
Author: Morten Welinder <terra gnome org>
Date:   Fri Mar 1 08:59:30 2013 -0500

    Solver: missed some conditionals last time.

 configure.ac           |    2 +-
 gnumeric-features.h.in |    2 --
 src/wbc-gtk-actions.c  |    7 +------
 src/wbc-gtk.c          |    2 --
 4 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 49dee70..b7a75eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/gnumeric-features.h.in b/gnumeric-features.h.in
index 4f208ee..f34e4ea 100644
--- a/gnumeric-features.h.in
+++ b/gnumeric-features.h.in
@@ -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
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 63b78df..468bcbf 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -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); }
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 81f80c8..8fa6cdb 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -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);