Hi, On Mon, Oct 04, 2010 at 04:42:28PM +0200, Florian Haas wrote: > # HG changeset patch > # User Florian Haas <[email protected]> > # Date 1286203318 -7200 > # Branch sid > # Node ID dcdec031614a6b68699faf2d6f9e72f075426bcc > # Parent 6d752193f776561d9543be21f75dd78b99de2789 > Low: remove residual autoconf checks for libxml and STONITH prereqs > > diff -r 6d752193f776 -r dcdec031614a configure.in > --- a/configure.in Tue May 25 14:43:43 2010 +0000 > +++ b/configure.in Mon Oct 04 16:41:58 2010 +0200 > @@ -535,7 +535,6 @@ > AC_DEFINE_UNQUOTED(IFCONFIG, "$IFCONFIG", path to the ifconfig command) > AC_PATH_PROGS(GETENT, getent) > AC_PATH_PROGS(IP2UTIL, ip, /sbin/ip) > -AC_PATH_PROGS(XML2CONFIG, xml2-config)
libxml2 is used by stonith (the program) for the meta-data. > AC_PATH_PROGS(REBOOT, reboot, /sbin/reboot) > AC_PATH_PROGS(POWEROFF_CMD, poweroff, /sbin/poweroff) > @@ -1021,35 +1020,6 @@ > AC_CHECK_HEADERS(sys/filio.h) > > dnl > -dnl These next two are used to help us figure out whether to include > -dnl some optional STONITH plugins... > -dnl > -AC_CHECK_HEADERS(vacmclient_api.h) > -AC_CHECK_HEADERS(curl/curl.h) > -AC_CHECK_HEADERS(openhpi/SaHpi.h) Hmm, why would you want to drop these? Not an expert on autoconf, but wouldn't that prevent building some plugins (e.g. bladehpi)? Dejan > -AC_MSG_CHECKING(for special libxml2 includes) > -if test "x$XML2CONFIG" = "x"; then > - AC_MSG_RESULT(libxml2 config not found) > -else > - XML2HEAD=`$XML2CONFIG --cflags` > - AC_MSG_RESULT($XML2HEAD) > - AC_CHECK_LIB(xml2, xmlReadMemory) > -fi > - > -CPPFLAGS="$CPPFLAGS $XML2HEAD" > - > -AC_CHECK_HEADERS(libxml/xpath.h) > - > -dnl > -dnl Could check for the libraries, but if you have the headers, > -dnl you're a dolt for not having installed the libs ;-) > -dnl > -AM_CONDITIONAL(USE_VACM, test "$ac_cv_header_vacmclient_api_h" = yes) > -AM_CONDITIONAL(USE_DRAC3, test "$ac_cv_header_curl_curl_h" = yes -a > "$ac_cv_header_libxml_xpath_h" = yes) > -AM_CONDITIONAL(USE_OPENHPI, test "$ac_cv_header_openhpi_SaHpi_h" = yes && > pkg-config --atleast-version 2.6 openhpi) > - > -dnl > dnl SNMP checks > dnl > > > > _______________________________________________________ > Linux-HA-Dev: [email protected] > http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev > Home Page: http://linux-ha.org/ _______________________________________________________ Linux-HA-Dev: [email protected] http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev Home Page: http://linux-ha.org/
