diff options
| author | NIIBE Yutaka <[email protected]> | 2020-02-18 07:01:41 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2020-02-18 07:01:41 +0000 |
| commit | a6ab8e3a710b899ecfb2ff518725314a1e0e64ff (patch) | |
| tree | 44598055c1f1604e662677e445b581dc7f748555 /src | |
| parent | logging: Also protect gpgrt_inc_errorcount against counter overflow. (diff) | |
| download | libgpg-error-a6ab8e3a710b899ecfb2ff518725314a1e0e64ff.tar.gz libgpg-error-a6ab8e3a710b899ecfb2ff518725314a1e0e64ff.zip | |
w32: Support static link with -lws2_32.
* configure.ac (GPG_ERROR_CONFIG_LIBS_PRIVATE): New.
* src/Makefile.am (socklibs): Use GPG_ERROR_CONFIG_LIBS_PRIVATE.
* src/gpg-error.pc.in: Require @GPG_ERROR_CONFIG_LIBS_PRIVATE@.
--
GnuPG-bug-id: 4623
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gpg-error.pc.in | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9303954..e9c057f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -156,7 +156,6 @@ uninstall-def-file: libgpg_error_la_DEPENDENCIES = $(gpg_error_res) gpg-error.def intllibs = -socklibs = -lws2_32 # # }}} End Windows part @@ -174,13 +173,14 @@ install-def-file: uninstall-def-file: intllibs = @LTLIBINTL@ -socklibs = endif # # }}} End Unix part # +socklibs = @GPG_ERROR_CONFIG_LIBS_PRIVATE@ + if HAVE_LD_VERSION_SCRIPT libgpg_error_vers_opt = -Wl,--version-script=$(srcdir)/gpg-error.vers else diff --git a/src/gpg-error.pc.in b/src/gpg-error.pc.in index e6ab104..970bb6c 100644 --- a/src/gpg-error.pc.in +++ b/src/gpg-error.pc.in @@ -11,4 +11,5 @@ Description: GPG Runtime Version: @PACKAGE_VERSION@ Cflags: @GPG_ERROR_CONFIG_CFLAGS@ Libs: @GPG_ERROR_CONFIG_LIBS@ +Libs.private: @GPG_ERROR_CONFIG_LIBS_PRIVATE@ URL: https://www.gnupg.org/software/libgpg-error/index.html |