Skip to content

Require libxml2 when building Dyninst launcher #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hainest wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Require libxml2 when building Dyninst launcher #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82f046d
Extract AX_PROG_XML2 into its own file
hainest Oct 9, 2024
2b310a3
Require libxml2 when building Dyninst launcher
hainest Oct 9, 2024
cfb6bd4
Update mini-xml-parse.c HAVE_XML2 check
hainest Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions config/dyninst.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ AC_DEFUN([AX_PROG_DYNINST],
AC_REQUIRE([AX_PROG_ELFUTILS])
AC_REQUIRE([AX_PROG_TBB])
AC_REQUIRE([AX_PROG_BOOST])
AC_REQUIRE([AX_PROG_XML2([2.5.0])])

AX_FLAGS_SAVE()

Expand Down Expand Up @@ -150,6 +151,10 @@ AC_DEFUN([AX_PROG_DYNINST],
AC_MSG_ERROR([Dyninst support was activated but a required dependency was not found. Please specify where to find Boost C++ libraries and includes with --with-boost.])
fi

if test "${XML2_INSTALLED}" != "yes" ; then
AC_MSG_ERROR([Dyninst support was activated but a required dependency was not found. Please specify where to find Boost C++ libraries and includes with --with-xml2.])
fi

dnl Search for Dyninst installation
AC_LANG_SAVE()
AC_LANG_PUSH([C++])
Expand Down
66 changes: 0 additions & 66 deletions config/macros.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,72 +603,6 @@ AC_DEFUN([AX_CHECK_PGI],
fi
])

# AX_PROG_XML2
# -----------
# Check for libxml2 installation
AC_DEFUN([AX_PROG_XML2],
[
AX_FLAGS_SAVE()

AC_ARG_WITH(xml-prefix,
AC_HELP_STRING(
[--with-xml-prefix@<:@=DIR@:>@],
[specify where to find libxml2 libraries and includes (deprecated, use --with-xml)]
),
[xml_paths="${withval}"],
[xml_paths="/usr/local /usr"] dnl List of possible default paths
)

AC_ARG_WITH(xml,
AC_HELP_STRING(
[--with-xml@<:@=DIR@:>@],
[specify where to find libxml2 libraries and includes]
),
[xml_paths="${withval}"]
dnl [xml_paths="/usr/local /usr"] dnl List of possible default not given here, taken from --with-xml-prefix
dnl dnl Activate this again when --with-xml-prefix is removed
)

AX_FIND_INSTALLATION([XML2], [${xml_paths}], [xml2-config], [], [], [], [xml2], [], [], [])
if test "$XML2_INSTALLED" = "yes" ; then

min_xml_version=ifelse([$1], ,2.0.0, [$1])
AC_MSG_CHECKING(for libxml2 version >= $min_xml_version)
min_xml_major_version=`echo ${min_xml_version} | cut -d. -f1`
min_xml_minor_version=`echo ${min_xml_version} | cut -d. -f2`
min_xml_micro_version=`echo ${min_xml_version} | cut -d. -f3`

xml_config_major_version=`${XML2_BIN_xml2_config} --version | cut -d. -f1`
xml_config_minor_version=`${XML2_BIN_xml2_config} --version | cut -d. -f2`
xml_config_micro_version=`${XML2_BIN_xml2_config} --version | cut -d. -f3`

if ((xml_config_major_version > min_xml_major_version)) ||
((xml_config_major_version == min_xml_major_version && xml_config_minor_version > min_xml_minor_version)) ||
((xml_config_major_version == major && xml_config_minor_version == min_xml_minor_version && xml_config_micro_version >= min_xml_micro_version)); then
AC_MSG_RESULT([yes ($xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)])
else
AC_MSG_RESULT([no ($xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)])
XML2_INSTALLED="no"
fi

XML2_CFLAGS="${XML2_CFLAGS} -I${XML2_INCLUDES}/libxml2"
XML2_CPPFLAGS="${XML2_CPPFLAGS} -I${XML2_INCLUDES}/libxml2"
XML2_CXXFLAGS="${XML2_CXXFLAGS} -I${XML2_INCLUDES}/libxml2"
AC_SUBST(XML2_CFLAGS)
AC_SUBST(XML2_CPPFLAGS)
AC_SUBST(XML2_CXXFLAGS)

CFLAGS=${XML2_CFLAGS}
AC_CHECK_HEADERS([libxml/parser.h libxml/xmlmemory.h], [], [$XML2_INSTALLED="no"])
fi
AX_FLAGS_RESTORE()

AM_CONDITIONAL(HAVE_XML2, test "${XML2_INSTALLED}" = "yes")
if test "$XML2_INSTALLED" = "yes" ; then
AC_DEFINE([HAVE_XML2], [1], [Defined if libxml2 is available])
fi
])

#
# TEST_BFD_SECTION_FUNCTION
# -------------------------
Expand Down
65 changes: 65 additions & 0 deletions config/xml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# AX_PROG_XML2
# -----------
# Check for libxml2 installation
AC_DEFUN([AX_PROG_XML2],
[
AX_FLAGS_SAVE()

AC_ARG_WITH(xml-prefix,
AC_HELP_STRING(
[--with-xml-prefix@<:@=DIR@:>@],
[specify where to find libxml2 libraries and includes (deprecated, use --with-xml)]
),
[xml_paths="${withval}"],
[xml_paths="/usr/local /usr"] dnl List of possible default paths
)

AC_ARG_WITH(xml,
AC_HELP_STRING(
[--with-xml@<:@=DIR@:>@],
[specify where to find libxml2 libraries and includes]
),
[xml_paths="${withval}"]
dnl [xml_paths="/usr/local /usr"] dnl List of possible default not given here, taken from --with-xml-prefix
dnl dnl Activate this again when --with-xml-prefix is removed
)

AX_FIND_INSTALLATION([XML2], [${xml_paths}], [xml2-config], [], [], [], [xml2], [], [], [])
if test "$XML2_INSTALLED" = "yes" ; then

min_xml_version=ifelse([$1], ,2.0.0, [$1])
AC_MSG_CHECKING(for libxml2 version >= $min_xml_version)
min_xml_major_version=`echo ${min_xml_version} | cut -d. -f1`
min_xml_minor_version=`echo ${min_xml_version} | cut -d. -f2`
min_xml_micro_version=`echo ${min_xml_version} | cut -d. -f3`

xml_config_major_version=`${XML2_BIN_xml2_config} --version | cut -d. -f1`
xml_config_minor_version=`${XML2_BIN_xml2_config} --version | cut -d. -f2`
xml_config_micro_version=`${XML2_BIN_xml2_config} --version | cut -d. -f3`

if ((xml_config_major_version > min_xml_major_version)) ||
((xml_config_major_version == min_xml_major_version && xml_config_minor_version > min_xml_minor_version)) ||
((xml_config_major_version == major && xml_config_minor_version == min_xml_minor_version && xml_config_micro_version >= min_xml_micro_version)); then
AC_MSG_RESULT([yes ($xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)])
else
AC_MSG_RESULT([no ($xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)])
XML2_INSTALLED="no"
fi

XML2_CFLAGS="${XML2_CFLAGS} -I${XML2_INCLUDES}/libxml2"
XML2_CPPFLAGS="${XML2_CPPFLAGS} -I${XML2_INCLUDES}/libxml2"
XML2_CXXFLAGS="${XML2_CXXFLAGS} -I${XML2_INCLUDES}/libxml2"
AC_SUBST(XML2_CFLAGS)
AC_SUBST(XML2_CPPFLAGS)
AC_SUBST(XML2_CXXFLAGS)

CFLAGS=${XML2_CFLAGS}
AC_CHECK_HEADERS([libxml/parser.h libxml/xmlmemory.h], [], [$XML2_INSTALLED="no"])
fi
AX_FLAGS_RESTORE()

AM_CONDITIONAL(HAVE_XML2, test "${XML2_INSTALLED}" = "yes")
if test "$XML2_INSTALLED" = "yes" ; then
AC_DEFINE([HAVE_XML2], [1], [Defined if libxml2 is available])
fi
])
6 changes: 1 addition & 5 deletions src/launcher/dyninst/mini-xml-parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@
#include "common.h"
#include "xalloc.h"

#if !defined(HAVE_XML2)

# error "You need libxml2 to compile this file!"

#else
#if defined(HAVE_XML2)

#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
Expand Down