Commit f2665e21 authored by Jørgen Lind's avatar Jørgen Lind Committed by Kristian Høgsberg
Browse files

Make expat a dependency to the scanner

parent 4c260db6
...@@ -40,11 +40,13 @@ AC_ARG_WITH(expat, [ --with-expat=<dir> Use expat from here], ...@@ -40,11 +40,13 @@ AC_ARG_WITH(expat, [ --with-expat=<dir> Use expat from here],
[ expat=$withval [ expat=$withval
CPPFLAGS="$CPPFLAGS -I$withval/include" CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib" ] ) LDFLAGS="$LDFLAGS -L$withval/lib" ] )
AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)], if test "x$enable_scanner" = "xyes"; then
[AC_MSG_ERROR([Can't find expat.h. Please install expat.])]) AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)],
AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-lexpat"], [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
[AC_MSG_ERROR([Can't find expat library. Please install expat.])]) AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-lexpat"],
AC_SUBST(EXPAT_LIBS) [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
AC_SUBST(EXPAT_LIBS)
fi
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
wayland-scanner.m4 wayland-scanner.m4
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment