From 907fbfff53157b447079aab587cc0f01ed0f000a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 20 Feb 2013 20:00:04 +0000
Subject: [PATCH] python: Use guestfs___free_string_list instead of custom
 version.

---
 generator/python.ml | 14 ++------------
 python/Makefile.am  |  7 ++++++-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/generator/python.ml b/generator/python.ml
index 5f3ab02d3..836ae0df1 100644
--- a/generator/python.ml
+++ b/generator/python.ml
@@ -137,16 +137,6 @@ put_table (char * const * const argv)
   return list;
 }
 
-static void
-free_strings (char **argv)
-{
-  size_t argc;
-
-  for (argc = 0; argv[argc] != NULL; ++argc)
-    free (argv[argc]);
-  free (argv);
-}
-
 ";
 
   let emit_put_list_function typ =
@@ -485,7 +475,7 @@ free_strings (char **argv)
            pr "  free (r);\n"
        | RStringList _ ->
            pr "  py_r = put_string_list (r);\n";
-           pr "  free_strings (r);\n"
+           pr "  guestfs___free_string_list (r);\n"
        | RStruct (_, typ) ->
            pr "  py_r = put_%s (r);\n" typ;
            pr "  guestfs_free_%s (r);\n" typ
@@ -494,7 +484,7 @@ free_strings (char **argv)
            pr "  guestfs_free_%s_list (r);\n" typ
        | RHashtable n ->
            pr "  py_r = put_table (r);\n";
-           pr "  free_strings (r);\n"
+           pr "  guestfs___free_string_list (r);\n"
        | RBufferOut _ ->
            pr "#ifdef HAVE_PYSTRING_ASSTRING\n";
            pr "  py_r = PyString_FromStringAndSize (r, size);\n";
diff --git a/python/Makefile.am b/python/Makefile.am
index dfb8e1ec3..e514a76d9 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -49,7 +49,12 @@ libguestfsmod_la_CPPFLAGS = \
 libguestfsmod_la_CFLAGS = \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 
-libguestfsmod_la_LIBADD = $(top_builddir)/src/libguestfs.la
+libguestfsmod_la_LIBADD = \
+	$(top_builddir)/src/libutils.la \
+	$(top_builddir)/src/libguestfs.la \
+	$(LIBXML2_LIBS) \
+	$(LIBVIRT_LIBS) \
+	../gnulib/lib/libgnu.la
 
 libguestfsmod_la_LDFLAGS = -avoid-version -shared