Skip to content

configure.in: Use pkg-config to find libxml2 #66

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
hughmcmaster wants to merge 1 commit into
base: master
Choose a base branch
from
Open

configure.in: Use pkg-config to find libxml2 #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 4 additions & 20 deletions configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET

PKG_PROG_PKG_CONFIG

# Check --with-XXX configuration
AC_ARG_WITH(curses-dir,
[ --with-curses-dir=PATH path to the curses installation],
Expand Down Expand Up @@ -172,12 +174,6 @@ AC_ARG_WITH(memlock,
fi
]
)
AC_ARG_WITH(xml2-dir,
[ --with-xml2-dir=PATH path to the xml2 installation],
[
PATH="${withval}/bin:${withval}:${PATH}"
]
)
AC_ARG_WITH(zlib-dir,
[ --with-zlib-dir=PATH path to the zlib installation],
[
Expand Down Expand Up @@ -350,23 +346,11 @@ fi
AC_SUBST(CDK_VERSION_DEF)
AC_SUBST(CDK_DEBIAN_DEP)

PKG_CHECK_MODULES([LIBXML], [libxml-2.0])

# ------------------------------------------------------------------------------
# libxml2 check from http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdelibs/kdoctools/configure.in.in?rev=1.38&content-type=text/x-cvsweb-markup

AC_PATH_PROG([XML_CONFIG], [xml2-config])
if test -z "$ac_cv_path_XML_CONFIG"; then
AC_MSG_ERROR([Could not find libxml2 anywhere.])
fi

LIBXML_LIBS="`$XML_CONFIG --libs`"
LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
LIBXML_XMLLINT=`dirname $XML_CONFIG`"/xmllint"
AC_SUBST(LIBXML_LIBS)
AC_SUBST(LIBXML_CFLAGS)
LIBXML_XMLLINT="$exec_prefix/bin/xmllint"
AC_SUBST(LIBXML_XMLLINT)


AC_PATH_PROG([GPGME_CONFIG], [gpgme-config])
if test -z "$ac_cv_path_GPGME_CONFIG"; then
AC_MSG_ERROR([Could not find gpgme anywhere.])
Expand Down