Commit 2dfb5ff6 authored by Chengwei Yang's avatar Chengwei Yang Committed by Simon McVittie
parent 0c20a0b3
...@@ -296,10 +296,9 @@ if("${sysname}" MATCHES ".*SOLARIS.*") ...@@ -296,10 +296,9 @@ if("${sysname}" MATCHES ".*SOLARIS.*")
endif(HAVE_CONSOLE_OWNER_FILE) endif(HAVE_CONSOLE_OWNER_FILE)
endif("${sysname}" MATCHES ".*SOLARIS.*") endif("${sysname}" MATCHES ".*SOLARIS.*")
#AC_ARG_WITH(xml, AS_HELP_STRING([--with-xml=[libxml/expat]],[XML library to use])) if(NOT EXPAT_FOUND)
if(NOT LIBXML2_FOUND AND NOT EXPAT_FOUND) message(FATAL "expat not found!")
message(FATAL "Neither expat nor libxml2 found!") endif(NOT EXPAT_FOUND)
endif(NOT LIBXML2_FOUND AND NOT EXPAT_FOUND)
SET(XML_LIB "Expat") SET(XML_LIB "Expat")
SET(XML_LIBRARY ${EXPAT_LIBRARIES}) SET(XML_LIBRARY ${EXPAT_LIBRARIES})
...@@ -566,7 +565,6 @@ message(" installing system libs: ${DBUS_INSTALL_SYSTEM_LIBS} " ...@@ -566,7 +565,6 @@ message(" installing system libs: ${DBUS_INSTALL_SYSTEM_LIBS} "
message(" Building Doxygen docs: ${DBUS_ENABLE_DOXYGEN_DOCS} ") message(" Building Doxygen docs: ${DBUS_ENABLE_DOXYGEN_DOCS} ")
message(" Building XML docs: ${DBUS_ENABLE_XML_DOCS} ") message(" Building XML docs: ${DBUS_ENABLE_XML_DOCS} ")
#message(" Gettext libs (empty OK): ${INTLLIBS} ") #message(" Gettext libs (empty OK): ${INTLLIBS} ")
message(" Using XML parser: ${XML_LIB} ")
message(" Daemon executable name: ${DBUS_DAEMON_NAME}") message(" Daemon executable name: ${DBUS_DAEMON_NAME}")
if (WIN32) if (WIN32)
message(" System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} ") message(" System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} ")
......
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