From f2665e21ce3f524bfacd6837f95acdee5f3903db Mon Sep 17 00:00:00 2001 From: Jørgen Lind Date: Thu, 4 Aug 2011 07:56:04 +0200 Subject: Make expat a dependency to the scanner --- configure.ac | 12 +++++++----- 1 file 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= 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 -- cgit v1.2.3