--- microdc2-0.15.6.orig/configure.ac	2006-12-24 19:43:36.000000000 +0100
+++ microdc2-0.15.6.orig/configure.ac	2009-12-23 16:02:23.000000000 +0100
@@ -43,27 +43,29 @@ OLD_LIBS="$LIBS"
 LIBS="$LIBS $READLINE_LIBS"
 AC_CHECK_FUNC(_rl_mark_modified_lines, [AC_DEFINE([HAVE__RL_MARK_MODIFIED_LINES])])
 LIBS="$OLD_LIBS"
-AH_TEMPLATE([HAVE_LIBXML2], [Define if libxml2 is installed])
-#AH_TEMPLATE([XML_SAVE_FORMAT], [1], [Define if libxml2 has no such option for xmlSave- functions])
-AC_PATH_PROG(XML_CONFIG, xml2-config)
-AC_PATH_PROG(TR, tr)
-if test -n "$XML_CONFIG" && test -n "$TR"; then
-  LIBXML2_VERSION=`$XML_CONFIG --version | $TR -d "."`
-  if test $LIBXML2_VERSION -eq 2616; then
-    AC_DEFINE([XML_SAVE_FORMAT], [1], [The libxml2 version 2.6.16 has no such option defined in the library headers])
-  fi
-  if test $LIBXML2_VERSION -ge 2616; then
-    AC_DEFINE([HAVE_LIBXML2])
-    LIBXML2_LIBS="`$XML_CONFIG --libs`"
-    LIBXML2_CFLAGS="`$XML_CONFIG --cflags`"
-    AC_SUBST(LIBXML2_LIBS)
-    AC_SUBST(LIBXML2_CFLAGS)
-#    LIBS="$LIBS $LIBXML2_LIBS"
-#    CFLAGS="$CFLAGS $LIBXML2_CFLAGS"
-  else
-    AC_MSG_WARN([XML libxml2 library version 2.6.16 or later is required to support XML filelists])
-  fi
-fi
+PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= 2.6.16, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
+AM_CONDITIONAL(HAVE_LIBXML2, test "x$HAVE_LIBXML2" = "xyes")
+##AH_TEMPLATE([HAVE_LIBXML2], [Define if libxml2 is installed])
+##AH_TEMPLATE([XML_SAVE_FORMAT], [1], [Define if libxml2 has no such option for xmlSave- functions])
+#AC_PATH_PROG(XML_CONFIG, xml2-config)
+#AC_PATH_PROG(TR, tr)
+#if test -n "$XML_CONFIG" && test -n "$TR"; then
+#  LIBXML2_VERSION=`$XML_CONFIG --version | $TR -d "."`
+#  if test $LIBXML2_VERSION -eq 2616; then
+#    AC_DEFINE([XML_SAVE_FORMAT], [1], [The libxml2 version 2.6.16 has no such option defined in the library headers])
+#  fi
+#  if test $LIBXML2_VERSION -ge 2616; then
+#    AC_DEFINE([HAVE_LIBXML2])
+#    LIBXML2_LIBS="`$XML_CONFIG --libs`"
+#    LIBXML2_CFLAGS="`$XML_CONFIG --cflags`"
+#    AC_SUBST(LIBXML2_LIBS)
+#    AC_SUBST(LIBXML2_CFLAGS)
+##    LIBS="$LIBS $LIBXML2_LIBS"
+##    CFLAGS="$CFLAGS $LIBXML2_CFLAGS"
+#  else
+#    AC_MSG_WARN([XML libxml2 library version 2.6.16 or later is required to support XML filelists])
+#  fi
+#fi
 
 # Checks for header files
 
@@ -72,6 +74,20 @@ AC_SYS_LARGEFILE
 AC_CHECK_TYPES([comparison_fn_t])
 AC_CHECK_MEMBERS(struct sigaction.sa_restorer,,,[#include <signal.h>])
 
+  AC_CHECK_LIB(bz2, BZ2_bzCompress, HAVE_BZ2=yes, HAVE_BZ2=no,)
+  if test "x$HAVE_BZ2" = "xyes"; then
+    AC_CHECK_HEADER(bzlib.h, :, HAVE_BZ2=no)
+    if test "x$HAVE_BZ2" = "xyes"; then
+      BZ2_LIBS="-lbz2"
+    fi
+  fi
+  AC_SUBST(HAVE_BZ2)
+  AC_SUBST(BZ2_LIBS)
+
+if test "x$HAVE_BZ2" = "xno"; then
+  AC_ERROR([libbz2 is required])
+fi
+
 # Checks for library functions
 
 # Output generation
--- microdc2-0.15.6.orig/src/Makefile.am	2006-11-29 14:02:50.000000000 +0100
+++ microdc2-0.15.6.orig/src/Makefile.am	2009-12-23 16:02:23.000000000 +0100
@@ -1,4 +1,4 @@ 
-SUBDIRS = common bzip2 tth
+SUBDIRS = common tth
 
 AM_CFLAGS = \
   -Wall \
@@ -43,12 +43,12 @@ tthsum_SOURCES = \
 
 microdc2_LDADD = \
   common/libcommon.a \
-  bzip2/libbzip2.a \
   tth/libtth.a \
   ../lib/libgnu.a \
   $(READLINE_LIBS) \
   $(LIBINTL) \
   $(LIBICONV) \
+  $(BZ2_LIBS) \
   $(LIBXML2_LIBS)
 
 
--- microdc2-0.15.6.orig/src/xml_flist.c	2006-12-24 17:54:36.000000000 +0100
+++ microdc2-0.15.6.orig/src/xml_flist.c	2009-12-23 16:02:37.000000000 +0100
@@ -9,7 +9,7 @@ 
 #include <libxml/xmlwriter.h>
 #include <libxml/xmlsave.h>
 
-#include "bzip2/bzlib.h"
+#include <bzlib.h>
 
 #include <inttypes.h>		/* ? */
 #include "iconvme.h"