Commit c08db4b997058d3c1157c071eadfc5822b3ac684
1 parent
cc74555a
Exists in
master
and in
1 other branch
Fixing MSYS/2 install.
Showing
3 changed files
with
10 additions
and
2 deletions
Show diff stats
Makefile.in
... | ... | @@ -232,6 +232,12 @@ install-dev: |
232 | 232 | src/include/lib3270/*.h \ |
233 | 233 | $(DESTDIR)$(includedir)/lib3270 |
234 | 234 | |
235 | + # Install PKG-CONFIG files | |
236 | + @$(MKDIR) $(DESTDIR)$(libdir)/pkgconfig | |
237 | + @$(INSTALL_DATA) \ | |
238 | + sdk/hllapi.pc \ | |
239 | + $(DESTDIR)$(libdir)/pkgconfig/hllapi.pc | |
240 | + | |
235 | 241 | install-windows-lib: \ |
236 | 242 | $(BINRLS)/$(SONAME) |
237 | 243 | ... | ... |
configure.ac
... | ... | @@ -256,8 +256,10 @@ fi |
256 | 256 | if test "$app_cv_static_ipc3270" == "yes"; then |
257 | 257 | PKG_CHECK_MODULES( [IPC3270], [ipc3270-static], AC_DEFINE(USING_STATIC_IPC3270), AC_MSG_ERROR([IPC3270 static not present.])) |
258 | 258 | AC_MSG_NOTICE([Not using libintl to avoid the dependency.]) |
259 | + app_cv_pkgconfig_requires="ipc3270-static" | |
259 | 260 | else |
260 | 261 | PKG_CHECK_MODULES( [IPC3270], [ipc3270], AC_DEFINE(USING_DYNAMIC_IPC3270), AC_MSG_ERROR([IPC3270 not present.])) |
262 | + app_cv_pkgconfig_requires="ipc3270" | |
261 | 263 | |
262 | 264 | # Use libintl only if using dynamic ipc3270 to avoid an extra DLL dependency. |
263 | 265 | AC_CHECK_HEADER(libintl.h, [ |
... | ... | @@ -286,6 +288,7 @@ AC_SUBST(IPC3270_CFLAGS) |
286 | 288 | 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` ]) |
287 | 289 | AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product) |
288 | 290 | AC_SUBST(PRODUCT_NAME,$app_cv_product) |
291 | +AC_SUBST(PKGCONFIG_REQUIRES,$app_cv_pkgconfig_requires) | |
289 | 292 | |
290 | 293 | dnl --------------------------------------------------------------------------- |
291 | 294 | dnl Check for pic | ... | ... |
sdk/hllapi.pc.in
... | ... | @@ -9,8 +9,7 @@ version_minor=@PACKAGE_MINOR_VERSION@ |
9 | 9 | Name: @PACKAGE_NAME@ |
10 | 10 | Description: @PACKAGE_DESCRIPTION@ |
11 | 11 | Version: @PACKAGE_VERSION@ |
12 | -Requires: ipc3270 lib3270 | |
12 | +Requires: @PKGCONFIG_REQUIRES@ | |
13 | 13 | Libs: -lhllapi |
14 | -Libs.private: @LIBS@ @INTL_LIBS@ @IPC3270_LIBS@ | |
15 | 14 | Cflags: |
16 | 15 | ... | ... |