[gnumeric] fixed external plugins compilation.

[Jean Bréfort <jbrefort src gnome org>]

commit a516756ca34b9e074040586fe04b45f810c5903d
Author: Jean Brefort <jean brefort normalesup org>
Date:   Mon Nov 16 14:42:24 2009 +0100

    fixed external plugins compilation.

 src/tools/ChangeLog    |    7 +++++++
 src/tools/Makefile.am  |    5 ++++-
 src/tools/gnm-solver.c |    4 ++--
 src/tools/gnm-solver.h |    2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/src/tools/ChangeLog b/src/tools/ChangeLog
index be1ec23..02235a7 100644
--- a/src/tools/ChangeLog
+++ b/src/tools/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-16  Jean Brefort  <jean brefort normalesup org>
+
+	* Makefile.am: fixed external plugins compilation.
+	* gnm-solver.c (gnm_solver_saveas): don't use a c++ reserved
+	name as variable name.
+	* gnm-solver.h: ditto.
+
 2009-11-01  Morten Welinder <terra gnome org>
 
 	* Release 1.9.15
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index c3042b4..327c4c6 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -44,7 +44,6 @@ libtools_la_SOURCES =					\
 	filter.h					\
 	filter.c					\
 	gnm-solver.c					\
-	gnm-solver.h					\
 	goal-seek.c					\
 	goal-seek.h					\
 	scenarios.c					\
@@ -55,3 +54,7 @@ libtools_la_SOURCES =					\
 	tabulate.h					\
 	tools.h
 
+libtools_la_includedir = $(includedir)/libspreadsheet- GNUMERIC_API_VER@/spreadsheet/tools
+libtools_la_include_HEADERS = 	\
+	gnm-solver.h
+
diff --git a/src/tools/gnm-solver.c b/src/tools/gnm-solver.c
index 9d7289e..4e7d3cf 100644
--- a/src/tools/gnm-solver.c
+++ b/src/tools/gnm-solver.c
@@ -936,7 +936,7 @@ gnm_solver_set_status (GnmSolver *solver, GnmSolverStatus status)
 gboolean
 gnm_solver_saveas (GnmSolver *solver, WorkbookControl *wbc,
 		   GOFileSaver *fs,
-		   const char *template, char **filename,
+		   const char *templ, char **filename,
 		   GError **err)
 {
 	int fd;
@@ -946,7 +946,7 @@ gnm_solver_saveas (GnmSolver *solver, WorkbookControl *wbc,
 	gboolean ok;
 	WorkbookView *wbv = wb_control_view (wbc);
 
-	fd = g_file_open_tmp (template, filename, err);
+	fd = g_file_open_tmp (templ, filename, err);
 	if (fd == -1) {
 		g_set_error (err, G_FILE_ERROR, 0,
 			     _("Failed to create file for linear program"));
diff --git a/src/tools/gnm-solver.h b/src/tools/gnm-solver.h
index 5fc4b72..ba7819b 100644
--- a/src/tools/gnm-solver.h
+++ b/src/tools/gnm-solver.h
@@ -235,7 +235,7 @@ gboolean gnm_solver_finished (GnmSolver *solver);
 
 gboolean gnm_solver_saveas (GnmSolver *solver, WorkbookControl *wbc,
 			    GOFileSaver *fs,
-			    const char *template, char **filename,
+			    const char *templ, char **filename,
 			    GError **err);
 
 gboolean gnm_solver_debug (void);