From c08db4b997058d3c1157c071eadfc5822b3ac684 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 30 Jul 2020 16:33:16 -0300 Subject: [PATCH] Fixing MSYS/2 install. --- Makefile.in | 6 ++++++ configure.ac | 3 +++ sdk/hllapi.pc.in | 3 +-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index cee61cc..102c1b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -232,6 +232,12 @@ install-dev: src/include/lib3270/*.h \ $(DESTDIR)$(includedir)/lib3270 + # Install PKG-CONFIG files + @$(MKDIR) $(DESTDIR)$(libdir)/pkgconfig + @$(INSTALL_DATA) \ + sdk/hllapi.pc \ + $(DESTDIR)$(libdir)/pkgconfig/hllapi.pc + install-windows-lib: \ $(BINRLS)/$(SONAME) diff --git a/configure.ac b/configure.ac index ec2e1ee..3bfd749 100644 --- a/configure.ac +++ b/configure.ac @@ -256,8 +256,10 @@ fi if test "$app_cv_static_ipc3270" == "yes"; then PKG_CHECK_MODULES( [IPC3270], [ipc3270-static], AC_DEFINE(USING_STATIC_IPC3270), AC_MSG_ERROR([IPC3270 static not present.])) AC_MSG_NOTICE([Not using libintl to avoid the dependency.]) + app_cv_pkgconfig_requires="ipc3270-static" else PKG_CHECK_MODULES( [IPC3270], [ipc3270], AC_DEFINE(USING_DYNAMIC_IPC3270), AC_MSG_ERROR([IPC3270 not present.])) + app_cv_pkgconfig_requires="ipc3270" # Use libintl only if using dynamic ipc3270 to avoid an extra DLL dependency. AC_CHECK_HEADER(libintl.h, [ @@ -286,6 +288,7 @@ AC_SUBST(IPC3270_CFLAGS) AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`pkg-config --variable=product_name lib3270` ]) AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product) AC_SUBST(PRODUCT_NAME,$app_cv_product) +AC_SUBST(PKGCONFIG_REQUIRES,$app_cv_pkgconfig_requires) dnl --------------------------------------------------------------------------- dnl Check for pic diff --git a/sdk/hllapi.pc.in b/sdk/hllapi.pc.in index f18e731..5ae5061 100644 --- a/sdk/hllapi.pc.in +++ b/sdk/hllapi.pc.in @@ -9,8 +9,7 @@ version_minor=@PACKAGE_MINOR_VERSION@ Name: @PACKAGE_NAME@ Description: @PACKAGE_DESCRIPTION@ Version: @PACKAGE_VERSION@ -Requires: ipc3270 lib3270 +Requires: @PKGCONFIG_REQUIRES@ Libs: -lhllapi -Libs.private: @LIBS@ @INTL_LIBS@ @IPC3270_LIBS@ Cflags: -- libgit2 0.21.2