[gnumeric] perl-loader: improve the dep situation a bit.

[Morten Welinder <mortenw src gnome org>]

commit b33e101dfe5243c4309c06c12f9b8e291ef4f34e
Author: Morten Welinder <terra gnome org>
Date:   Fri Dec 29 11:33:44 2017 -0500

    perl-loader: improve the dep situation a bit.
    
    Just enough that a new version forces a recompile, I hope.

 plugins/perl-loader/ChangeLog     |    6 ++++++
 plugins/perl-loader/Makefile.am   |    6 ++++++
 plugins/perl-loader/perl-loader.c |    5 ++---
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/plugins/perl-loader/ChangeLog b/plugins/perl-loader/ChangeLog
index 08c19bd..18f85ec 100644
--- a/plugins/perl-loader/ChangeLog
+++ b/plugins/perl-loader/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-29  Morten Welinder  <terra gnome org>
+
+       * perl-loader.c: Don't depend on expr-impl.h
+
+       * Makefile.am (perl-gnumeric.lo): Add a few deps by hand.
+
 2017-12-28  Morten Welinder <terra gnome org>
 
        * Release 1.12.38
diff --git a/plugins/perl-loader/Makefile.am b/plugins/perl-loader/Makefile.am
index 7fa9b1d..dc87f3c 100644
--- a/plugins/perl-loader/Makefile.am
+++ b/plugins/perl-loader/Makefile.am
@@ -21,6 +21,12 @@ perl_loader_la_SOURCES = \
 nodist_perl_loader_la_SOURCES = \
        xsinit.c
 
+# Auto dep tracking is off here.  Add a few deps by hand
+boot.lo: $(srcdir)/../../gnumeric-config.h $(srcdir)/../../src/gnumeric.h $(srcdir)/../../src/gnm-plugin.h 
+perl-loader.lo: $(srcdir)/../../gnumeric-config.h $(srcdir)/../../src/gnumeric.h $(srcdir)/../../src/expr.h 
$(srcdir)/../../src/value.h $(srcdir)/../../src/sheet.h
+perl-gnumeric.lo: $(srcdir)/../../gnumeric-config.h $(srcdir)/../../src/gnumeric.h 
$(srcdir)/../../src/expr.h $(srcdir)/../../src/value.h $(srcdir)/../../src/func.h
+
+
 # Use the right compiler.  This is not 100% correct: we use GNUMERIC_CFLAGS
 # here which might contain stuff we don't like.  It looks good enough,
 # though.
diff --git a/plugins/perl-loader/perl-loader.c b/plugins/perl-loader/perl-loader.c
index b0bf8cc..f3606f0 100644
--- a/plugins/perl-loader/perl-loader.c
+++ b/plugins/perl-loader/perl-loader.c
@@ -15,7 +15,6 @@
 #include <sheet.h>
 #include <value.h>
 #include <expr.h>
-#include <expr-impl.h>
 #include <gnm-plugin.h>
 
 #include <goffice/goffice.h>
@@ -53,7 +52,7 @@ call_perl_function_args (GnmFuncEvalInfo *ei, GnmValue const * const *args)
        GnmValue* result;
        dSP;
 
-       fndef = ei->func_call->func;
+       fndef = gnm_expr_get_func_def ((GnmExpr *)(ei->func_call));
        perl_func = g_strconcat ("func_", fndef->name, NULL);
 
        function_def_count_args (fndef, &min_n_args, &max_n_args);
@@ -294,7 +293,7 @@ gplp_load_base (GOPluginLoader *loader, GOErrorInfo **ret_error)
        argc = 2;
 
        if (g_file_test (argv[2], G_FILE_TEST_EXISTS)) {
-               PERL_SYS_INIT3 (&argc, &argv, NULL);
+               PERL_SYS_INIT3 (&argc, (char ***)&argv, NULL);
                gnm_perl_interp = perl_alloc ();
                perl_construct (gnm_perl_interp);
                perl_parse (gnm_perl_interp, xs_init, 3, argv, NULL);