shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-01-11 05:17:37 +03:00
Code

build: Stop installing libxml.m4

Browse Source 
This file is deprecated and unmaintained. It will be kept in the source
tree for a while.
This commit is contained in:
Nick Wellnhofer 2024-06-15 20:14:03 +02:00
parent 6ed39a82c6
commit e714f506e4
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -682,10 +682,6 @@ endif()
configure_file(xml2-config.in xml2-config @ONLY) configure_file(xml2-config.in xml2-config @ONLY)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xml2-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT development) 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_INCLUDEDIR "-I${CMAKE_INSTALL_FULL_INCLUDEDIR}/libxml2")
set(XML_LIBDIR "-L${CMAKE_INSTALL_FULL_LIBDIR}") set(XML_LIBDIR "-L${CMAKE_INSTALL_FULL_LIBDIR}")

4
Makefile.am
View File

@ -110,10 +110,6 @@ endif
DEPS = libxml2.la DEPS = libxml2.la
LDADDS = libxml2.la LDADDS = libxml2.la
m4datadir = $(datadir)/aclocal
dist_m4data_DATA = libxml.m4
runtest_SOURCES=runtest.c runtest_SOURCES=runtest.c
runtest_DEPENDENCIES = $(DEPS) runtest_DEPENDENCIES = $(DEPS)
runtest_LDADD= $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS) runtest_LDADD= $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)

2
libxml.m4
View File

@ -1,6 +1,8 @@
dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) 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 Test for XML, and define XML_CPPFLAGS and XML_LIBS
dnl dnl
dnl Deprecated and unmaintained. Use pkg-config or xslt-config.
dnl
AC_DEFUN([AM_PATH_XML2],[ AC_DEFUN([AM_PATH_XML2],[
m4_warn([obsolete], [AM_PATH_XML2 is deprecated, use PKG_CHECK_MODULES instead]) m4_warn([obsolete], [AM_PATH_XML2 is deprecated, use PKG_CHECK_MODULES instead])
AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_REQUIRE([PKG_PROG_PKG_CONFIG])

2
meson.build
View File

@ -776,8 +776,6 @@ configure_file(
install_dir: dir_lib / 'cmake' / 'libxml2', install_dir: dir_lib / 'cmake' / 'libxml2',
) )
install_data(files('libxml.m4'), install_dir: dir_data / 'aclocal')
if support_tls == false if support_tls == false
message('===============================================================') message('===============================================================')
message('WARNING: Your C compiler appears to not support thread-local') message('WARNING: Your C compiler appears to not support thread-local')