hivexml on OS X was failing with a symbol-not-found error while

dynamically linking.  Adding iconv to libhivex fixes the issue and lets

OS X process 'images/large' with hivexml.

It took careful iconv autotool additions to get compilation working in

Fedora as well, but these two lines build and run on OS X 10.6 and

10.8, and Fedora 17 and 18.

Unfortunately, a separate issue is revealed here in OS X, as some of

the hivexml value data appears as Kanji.  However, that is an issue

distinct from getting the program to run.

Signed-off-by: Alex Nelson <a.nelson@prometheuscomputing.com>

---

 configure.ac    | 1 +

 lib/Makefile.am | 1 +

 2 files changed, 2 insertions(+)

diff --git a/configure.ac b/configure.ac

index 0dfb995..298e6a9 100644

--- a/configure.ac

+++ b/configure.ac

@@ -184,6 +184,7 @@ AS_IF([test "x$with_readline" != xno],

 dnl For i18n.

 AM_GNU_GETTEXT([external])

 AM_GNU_GETTEXT_VERSION([0.17])

+AM_ICONV

 

 dnl libxml2.

 PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])

diff --git a/lib/Makefile.am b/lib/Makefile.am

index a339a00..8d7ff69 100644

--- a/lib/Makefile.am

+++ b/lib/Makefile.am

@@ -36,6 +36,7 @@ libhivex_la_LIBADD =  ../gnulib/lib/libgnu.la $(LTLIBOBJS)

 libhivex_la_LDFLAGS = \

  -version-info 0:0:0 \

  $(VERSION_SCRIPT_FLAGS)$(srcdir)/hivex.syms \

+ $(LTLIBICONV) \

  $(LTLIBINTL) \

  $(LTLIBTHREAD)

 libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)

-- 

1.8.2