Autotools: Simplify expat.pc templating (now that we can)

This commit is contained in:
Sebastian Pipping 2021-06-23 20:41:38 +02:00
parent 1d4bb74c34
commit 19dd50990d
2 changed files with 2 additions and 5 deletions

View File

@ -394,9 +394,6 @@ AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_CXXFLAGS]) AC_SUBST([AM_CXXFLAGS])
AC_SUBST([AM_LDFLAGS]) AC_SUBST([AM_LDFLAGS])
dnl updating _EXPAT_LIBRARY_NAME variable to effect the package name in expat.pc file (issues #361 and #495)
AC_SUBST(_EXPAT_LIBRARY_NAME, ["$PACKAGE_NAME"])
AS_CASE("${host_os}", AS_CASE("${host_os}",
[darwin*], [CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__macos.cmake.in], [darwin*], [CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__macos.cmake.in],
[mingw*], [CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__windows.cmake.in], [mingw*], [CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__windows.cmake.in],

View File

@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: @_EXPAT_LIBRARY_NAME@ Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Description: expat XML parser Description: expat XML parser
URL: https://libexpat.github.io/ URL: https://libexpat.github.io/
Libs: -L${libdir} -l@_EXPAT_LIBRARY_NAME@ Libs: -L${libdir} -l@PACKAGE_NAME@
Cflags: -I${includedir} Cflags: -I${includedir}