From 56075a3c5ee7f38a03d2a645f406dc0b8620efdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= <kloczek@github.com>
Date: Thu, 12 Oct 2023 12:19:16 +0000
Subject: [PATCH] remove use deprecated AM_PATH_XML2 aclocal macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove use deprecated AM_PATH_XML2 and use PKG_CHECK_MODULES and
PKG_PROG_PKG_CONFIG aclocal macros.

Signed-off-by: Tomasz Kłoczko <kloczek@github.com>
---
 configure.ac    | 7 ++++---
 lib/Makefile.am | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 62fc3d8..f4d7d30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ AM_INIT_AUTOMAKE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_CONFIG_MACRO_DIR([m4])
+PKG_PROG_PKG_CONFIG
 
 # Special host-dependent stuff
 case ${host} in
@@ -92,10 +93,10 @@ if test "x$with_libexpat" = "xyes"; then
 fi
 
 if test "x$with_libxml2" = "xyes" && test "x$have_libexpat" != "xyes"; then
-   AM_PATH_XML2([2.6.24], [have_libxml2=yes])
-   if test "x$have_libxml2" = "xyes"; then
+   PKG_CHECK_MODULES([XML], [libxml-2.0 >= 2.6.24], [
       AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have libxml2.])
-   fi
+      have_libxml2=yes
+   ])
 fi
 
 if test "x$have_libexpat" != "xyes" && test "x$have_libxml2" != "xyes"; then
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2417573..3818572 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,8 +2,8 @@ SUBDIRS = includes
 
 AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes \
 	$(WARNCFLAGS) $(ADDCFLAGS) \
-	@XML_CPPFLAGS@ @EXPAT_CFLAGS@ \
-	@DEFS@
+	$(XML_CFLAGS) \
+	$(EXPAT_CFLAGS)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmetalink.pc
@@ -60,4 +60,5 @@ endif
 libmetalink_la_SOURCES = $(HFILES) $(OBJECTS)
 libmetalink_la_LDFLAGS = -no-undefined \
         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-	@XML_LIBS@ @EXPAT_LIBS@
+	$(XML_LIBS) \
+	$(EXPAT_LIBS)