Skip to content

remove use deprecated AM_PATH_XML2 aclocal macro #4

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

remove use deprecated AM_PATH_XML2 aclocal macro #4

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions lib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)