aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap2
diff options
context:
space:
mode:
authorRoger Pau Monne <roger.pau@entel.upc.edu>2011-12-20 08:31:40 +0100
committerRoger Pau Monne <roger.pau@entel.upc.edu>2011-12-20 08:31:40 +0100
commita69dda2bcef661c81b88b52053eef4369cb11b01 (patch)
treefbceca338ec166e85147767477904aa8ac202909 /tools/blktap2
parent8ade3afcf088522ac4004c6b8d7d69e7a562cc85 (diff)
downloadxen-a69dda2bcef661c81b88b52053eef4369cb11b01.tar.gz
xen-a69dda2bcef661c81b88b52053eef4369cb11b01.tar.bz2
xen-a69dda2bcef661c81b88b52053eef4369cb11b01.zip
blktap2/vhd: add -liconv when linking if using libiconv
If libiconv is detected on the system add -liconv when linking the libvhd library. If -liconv is not added when compiling libvhd with libiconv the following error occours when linking vhd-util and vhd-update: gcc -o vhd-util vhd-util.o -Llib -lvhd lib/libvhd.so: undefined reference to `libiconv_open' lib/libvhd.so: undefined reference to `libiconv_close' lib/libvhd.so: undefined reference to `libiconv' Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Committed-by: Ian Jackson <ian.jackson.citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/blktap2')
-rw-r--r--tools/blktap2/vhd/lib/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile
index 97379c117e..b72e4d9565 100644
--- a/tools/blktap2/vhd/lib/Makefile
+++ b/tools/blktap2/vhd/lib/Makefile
@@ -23,6 +23,10 @@ ifeq ($(CONFIG_Linux),y)
LIBS := -luuid
endif
+ifeq ($(CONFIG_LIBICONV),y)
+LIBS += -liconv
+endif
+
LIB-SRCS := libvhd.c
LIB-SRCS += libvhd-journal.c
LIB-SRCS += vhd-util-coalesce.c