From a77821c864dc57af8c7c417ce3d9da090155fa7a Mon Sep 17 00:00:00 2001
From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Wed, 31 Mar 2010 22:29:42 +0200
Subject: [PATCH] Fix linker errors in proxy

domain_conf.c:494: undefined reference to 'virNWFilterHashTableFree'
domain_conf.c:5107: undefined reference to 'virNWFilterFormatParamAttributes'

Add missing source to the proxy and disable XML parsing code in
nwfilter_params.c for a proxy build.
---
 proxy/Makefile.am          | 2 ++
 src/conf/nwfilter_params.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index aef11caa39..9ea91d8f0b 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -15,6 +15,7 @@ libexec_PROGRAMS = libvirt_proxy
 
 libvirt_proxy_SOURCES = libvirt_proxy.c \
             @top_srcdir@/src/util/buf.c \
+            @top_srcdir@/src/util/hash.c \
 	    @top_srcdir@/src/util/logging.c \
             @top_srcdir@/src/util/memory.c \
             @top_srcdir@/src/util/network.c \
@@ -26,6 +27,7 @@ libvirt_proxy_SOURCES = libvirt_proxy.c \
             @top_srcdir@/src/conf/storage_encryption_conf.c \
             @top_srcdir@/src/conf/domain_conf.c \
             @top_srcdir@/src/conf/cpu_conf.c \
+            @top_srcdir@/src/conf/nwfilter_params.c \
             @top_srcdir@/src/xen/xend_internal.c \
 	    @top_srcdir@/src/xen/xen_hypervisor.c \
 	    @top_srcdir@/src/xen/sexpr.c  \
diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index 38a51c9603..286c5ef1bf 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -214,6 +214,7 @@ err_exit:
 }
 
 
+#ifndef PROXY
 virNWFilterHashTablePtr
 virNWFilterParseParamAttributes(xmlNodePtr cur)
 {
@@ -254,6 +255,7 @@ skip_entry:
     }
     return table;
 }
+#endif
 
 
 struct formatterParam {