aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2010-11-22 21:05:06 +0000
committerRobert Bragg <robert@linux.intel.com>2010-12-09 22:46:48 +0000
commit6110929163e5239f15a556b57f1daec20b6a3a3c (patch)
tree00944b203cd7453aa5582473bf9d236784ca8fb1
parenteac6c1665a1bf39feb46a9ffce061ace61c946a3 (diff)
downloadlibmatchboxwm2-6110929163e5239f15a556b57f1daec20b6a3a3c.tar.gz
libmatchboxwm2-6110929163e5239f15a556b57f1daec20b6a3a3c.tar.bz2
libmatchboxwm2-6110929163e5239f15a556b57f1daec20b6a3a3c.zip
configure: unconditionally check for libexpat.so
This adds a configure.ac check for expat.h and libexpat.so since the theming code currently assumes this API.
-rw-r--r--configure.ac10
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 3ca9697..53bf54b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ LT_PREREQ([2.2.6])
LT_INIT([disable-static])
AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h string.h expat.h])
+AC_CHECK_HEADERS([stdlib.h string.h])
AC_C_CONST
AC_CHECK_FUNCS([memset strdup strncasecmp])
@@ -235,6 +235,14 @@ if test x$have_xcursor = xyes; then
AC_DEFINE(HAVE_XCURSOR, [1], [Use XCursor to sync pointer themes])
fi
+AC_CHECK_HEADERS([expat.h],
+ [],
+ [AC_MSG_ERROR([Unable to locate required expat header])])
+
+AC_CHECK_LIB(expat, [XML_ParserCreate],
+ [MBWM_LIBS="$MBWM_LIBS -lexpat"],
+ [AC_MSG_ERROR([Required expat library not found])])
+
MBWM_INCS='-I$(top_srcdir) -I$(top_srcdir)/matchbox -I$(top_builddir)'
MBWM_CFLAGS="$MBWM_CFLAGS $MBWM_DEBUG_CFLAGS $XFIXES_CFLAGS $XEXT_CFLAGS $XCURSOR_CFLAGS $MANAGER_DEFINE"
MBWM_LIBS="$MBWM_LIBS $XFIXES_LIBS $XEXT_LIBS $XCURSOR_LIBS $MBWM_EXTRA_LIBS"