diff --git a/CMakeLists.txt b/CMakeLists.txt index ef4e0e7b..d7b4a2cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -682,10 +682,6 @@ endif() configure_file(xml2-config.in xml2-config @ONLY) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xml2-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT development) -if(UNIX) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libxml.m4 DESTINATION ${CMAKE_INSTALL_DATADIR}/aclocal) -endif() - set(XML_INCLUDEDIR "-I${CMAKE_INSTALL_FULL_INCLUDEDIR}/libxml2") set(XML_LIBDIR "-L${CMAKE_INSTALL_FULL_LIBDIR}") diff --git a/Makefile.am b/Makefile.am index 8f49bf3d..d285540c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -110,10 +110,6 @@ endif DEPS = libxml2.la LDADDS = libxml2.la - -m4datadir = $(datadir)/aclocal -dist_m4data_DATA = libxml.m4 - runtest_SOURCES=runtest.c runtest_DEPENDENCIES = $(DEPS) runtest_LDADD= $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS) diff --git a/libxml.m4 b/libxml.m4 index 27ad84d4..4c031a5b 100644 --- a/libxml.m4 +++ b/libxml.m4 @@ -1,6 +1,8 @@ dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS dnl +dnl Deprecated and unmaintained. Use pkg-config or xslt-config. +dnl AC_DEFUN([AM_PATH_XML2],[ m4_warn([obsolete], [AM_PATH_XML2 is deprecated, use PKG_CHECK_MODULES instead]) AC_REQUIRE([PKG_PROG_PKG_CONFIG]) diff --git a/meson.build b/meson.build index 5d2622f7..72a4fcf0 100644 --- a/meson.build +++ b/meson.build @@ -776,8 +776,6 @@ configure_file( install_dir: dir_lib / 'cmake' / 'libxml2', ) -install_data(files('libxml.m4'), install_dir: dir_data / 'aclocal') - if support_tls == false message('===============================================================') message('WARNING: Your C compiler appears to not support thread-local')