summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-08-04 07:56:04 +0200
committerKristian Høgsberg <krh@bitplanet.net>2011-08-12 16:25:18 -0400
commitf2665e21ce3f524bfacd6837f95acdee5f3903db (patch)
tree14562089d8a1ff4e14427894ca6ac7dd5e4d0a84
parent4c260db68c028f05401727d1911582ae8b87cd70 (diff)
Make expat a dependency to the scanner
-rw-r--r--configure.ac12
1 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index bac5a0f..3ea77e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,11 +40,13 @@ AC_ARG_WITH(expat, [ --with-expat=<dir> Use expat from here],
[ expat=$withval
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib" ] )
-AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)],
- [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
-AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-lexpat"],
- [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
-AC_SUBST(EXPAT_LIBS)
+if test "x$enable_scanner" = "xyes"; then
+ AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)],
+ [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
+ AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-lexpat"],
+ [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
+ AC_SUBST(EXPAT_LIBS)
+fi
AC_CONFIG_FILES([Makefile
wayland-scanner.m4