Commit 271e886c authored by John Douglas Veitch's avatar John Douglas Veitch
Browse files

Fix build system

Original: c21267853c257011e93251fd1a3b0d1e72acf84e
parent c9466026
...@@ -134,7 +134,15 @@ LALSUITE_CHECK_LIB([LALInspiral],[1.1.0.2],[LALInspiralParameterCalc],[lal/LALIn ...@@ -134,7 +134,15 @@ LALSUITE_CHECK_LIB([LALInspiral],[1.1.0.2],[LALInspiralParameterCalc],[lal/LALIn
LALSUITE_CHECK_LIB([LALPulsar],[1.1.0.2],[XLALComputeFaFb],[lal/ComputeFstat.h]) LALSUITE_CHECK_LIB([LALPulsar],[1.1.0.2],[XLALComputeFaFb],[lal/ComputeFstat.h])
# check for lalxml # check for lalxml
LALSUITE_CHECK_OPT_LIB([LALXML],[1.0.0.2],[XLALXMLFilePrintElements],[lal/LALXML.h]) LALSUITE_CHECK_OPT_LIB([LALXML],[1.1.0.3],[XLALXMLFilePrintElements],[lal/LALXML.h])
if test "$lalxml" = "true"; then
# check for libxml2
PKG_CHECK_MODULES([LIBXML2],[libxml-2.0 >= 2.6],[true],[false])
CPPFLAGS="$CPPFLAGS $LIBXML2_CFLAGS"
LIBS="$LIBS $LIBXML2_LIBS"
AC_CHECK_LIB([xml2],[xmlInitParser],,[AC_MSG_WARN([cannot find the xml2 library])])
fi
# add gcc specific flags # add gcc specific flags
if test "$GCC" = yes; then if test "$GCC" = yes; then
......
...@@ -25,15 +25,8 @@ ...@@ -25,15 +25,8 @@
#include <string.h> #include <string.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xpath.h>
#include <lal/XLALError.h> #include <lal/XLALError.h>
#include <lal/LALXML.h>
#include <lal/LALXMLVOTableCommon.h>
#include <lal/LALXMLVOTableSerializers.h>
#include <lal/LALInferenceXML.h> #include <lal/LALInferenceXML.h>
#define INT4STR_MAXLEN 15 #define INT4STR_MAXLEN 15
......
...@@ -33,14 +33,13 @@ ...@@ -33,14 +33,13 @@
extern "C" { extern "C" {
#endif #endif
/*#include <libxml/tree.h>
#include <libxml/tree.h> #include <libxml/xpath.h>
#include <lal/LALXML.h> */
#include <lal/LALXML.h> #include <lal/LALXML.h>
#include <lal/LALXMLVOTableCommon.h> #include <lal/LALXMLVOTableCommon.h>
#include <lal/LALXMLVOTableSerializers.h> #include <lal/LALXMLVOTableSerializers.h>
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#include <lal/LALInference.h> #include <lal/LALInference.h>
xmlNodePtr XLALInferenceVariablesArray2VOTTable(const LALInferenceVariables *varsArray, UINT4 N); xmlNodePtr XLALInferenceVariablesArray2VOTTable(const LALInferenceVariables *varsArray, UINT4 N);
......
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