diff options
| author | NIIBE Yutaka <[email protected]> | 2018-10-24 01:41:00 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-10-24 01:41:00 +0000 |
| commit | 9c74661d6f8028c616932b02eb5360a2e3587e81 (patch) | |
| tree | f05129e98094d8ed5488e8c1484968f699967c91 | |
| parent | build: Update gpg-error.m4 from libgpg-error. (diff) | |
| download | libassuan-9c74661d6f8028c616932b02eb5360a2e3587e81.tar.gz libassuan-9c74661d6f8028c616932b02eb5360a2e3587e81.zip | |
build: Provide libassuan.pc, generated by configure.
* configure.ac (PACKAGE, VERSION): Remove.
Generate src/libassuan.pc.
* src/Makefile.am (pkgconfigdir, pkgconfig_DATA): New.
(assuan.h): Use PACKAGE_VERSION and VERSION_NUMBER vars.
* src/libassuan-config.in: Use @PACKAGE_VERSION@.
* src/libassuan.pc.in: New.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/libassuan-config.in | 2 | ||||
| -rw-r--r-- | src/libassuan.pc.in | 14 |
4 files changed, 22 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index dad379a..2dadcd9 100644 --- a/configure.ac +++ b/configure.ac @@ -73,9 +73,6 @@ AC_SUBST(LIBASSUAN_LT_CURRENT) AC_SUBST(LIBASSUAN_LT_AGE) AC_SUBST(LIBASSUAN_LT_REVISION) -PACKAGE=$PACKAGE_NAME -VERSION=$PACKAGE_VERSION - AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) AM_MAINTAINER_MODE @@ -88,17 +85,10 @@ AB_INIT AC_GNU_SOURCE - -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package]) -AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",[Bug report address]) VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x%02x" mym4_major \ mym4_minor mym4_micro) AC_SUBST(VERSION_NUMBER) - # Don't default to build static libs. LT_PREREQ([2.2.6]) LT_INIT([win32-dll disable-static]) @@ -456,6 +446,7 @@ AC_CONFIG_FILES([doc/Makefile]) AC_CONFIG_FILES([tests/Makefile]) AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config]) AC_CONFIG_FILES([src/versioninfo.rc]) +AC_CONFIG_FILES([src/libassuan.pc]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index f353e29..089bc97 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,8 +19,12 @@ # SPDX-License-Identifier: LGPL-2.1+ ## Process this file with automake to produce Makefile.in +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libassuan.pc + EXTRA_DIST = libassuan-config.in libassuan.m4 libassuan.vers \ - versioninfo.rc.in libassuan.def mkheader.c gpgcedev.def + versioninfo.rc.in libassuan.def mkheader.c gpgcedev.def \ + libassuan.pc.in AM_CPPFLAGS = -I.. bin_SCRIPTS = libassuan-config @@ -149,6 +153,4 @@ mkheader: mkheader.c Makefile assuan.h: assuan.h.in mkheader $(parts_of_assuan_h) ./mkheader $(host_os) $(srcdir)/assuan.h.in \ - @VERSION@ @VERSION_NUMBER@ >$@ - - + $(PACKAGE_VERSION) $(VERSION_NUMBER) >$@ diff --git a/src/libassuan-config.in b/src/libassuan-config.in index 04177f0..c551bcb 100644 --- a/src/libassuan-config.in +++ b/src/libassuan-config.in @@ -71,7 +71,7 @@ while test $# -gt 0; do echo_exec_prefix=yes ;; --version) - echo "@VERSION@" + echo "@PACKAGE_VERSION@" exit 0 ;; --api-version) diff --git a/src/libassuan.pc.in b/src/libassuan.pc.in new file mode 100644 index 0000000..6b245fa --- /dev/null +++ b/src/libassuan.pc.in @@ -0,0 +1,14 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ +libdir=@libdir@ +host=@LIBASSUAN_CONFIG_HOST@ +api_version=@LIBASSUAN_CONFIG_API_VERSION@ + +Name: libassuan +Description: IPC library for the GnuPG components +Requires: gpg-error +Version: @PACKAGE_VERSION@ +Cflags: @LIBASSUAN_CONFIG_CFLAGS@ +Libs: @LIBASSUAN_CONFIG_LIB@ @LIBASSUAN_CONFIG_EXTRA_LIBS@ +URL: https://www.gnupg.org/related_software/libassuan/index.html |