Check for libbz2

diff --git a/configure.ac b/configure.ac
index 67d6854c7df1d0fab6055a286c6a969a297bc1dc..e02c90eb6843750c12b33560f4e022c34a85e336 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -175,20 +175,27 @@ if test "x$HAVE_GST" = "xyes"; then
  GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstapp-0.10"
  AC_SUBST(GSTREAMER_LIBS)
  AC_SUBST(GSTREAMER_CFLAGS)
+else
+ AC_MSG_ERROR([Mapper requires gstreamer.])
 fi
 
-# XXX: Check for expat
-AC_CHECK_HEADER(expat.h)
-EXPAT_LIBS="-lexpat"
-EXPAT_CFLAGS="-I/usr/include"
-AC_SUBST(EXPAT_CFLAGS)
-AC_SUBST(EXPAT_LIBS)
+AC_CHECK_HEADERS(bzlib.h,
+    BZ2_LIBS="$BZ2_LIBS -lbz2",
+    AC_MSG_ERROR([Mapper requires libbz2.])
+    )
+AC_SUBST(BZ2_LIBS)
 
 AC_CHECK_LIB([expat], [XML_ParserCreate],
   AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat])
-  AC_SUBST(EXPAT_LIB)
+  AC_SUBST(EXPAT_LIBS)
 )
 
+AC_CHECK_HEADERS(expat.h,
+       EXPAT_LIBS="-lexpat",
+       AC_MSG_ERROR([Mapper requires libexpat.])
+       )
+AC_SUBST(EXPAT_LIBS)
+
 AC_CHECK_HEADER(espeak/speak_lib.h)
 ESPEAK_LIBS="-lespeak"
 ESPEAK_CFLAGS="-I/usr/include/espeak"