diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2018-10-25 18:11:26 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2018-10-25 18:11:26 +0900 |
| commit | 1dd2430d8877ffda43bc46f0d5f23fea4801ecf6 (patch) | |
| tree | f19e05c2a000ca7b3592a8177e3efc26a0dbfa4d | |
| parent | 27f4671883e3241ac0fdee3935c8707c816686b6 (diff) | |
| download | libassuan-1dd2430d8877ffda43bc46f0d5f23fea4801ecf6.tar.gz | |
build: Use LIBASSUAN_CONFIG_LIBS (instead of LIB).
* configure.ac (LIBASSUAN_CONFIG_LIBS): Rename from *_LIB.
(LIBASSUAN_CONFIG_EXTRA_LIBS): Remove.
* src/libassuan-config.in: Follow the change.
* src/libassuan.pc.in: Likewise.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/libassuan-config.in | 4 | ||||
| -rw-r--r-- | src/libassuan.pc.in | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 0cb2896..15f6f18 100644 --- a/configure.ac +++ b/configure.ac @@ -290,18 +290,16 @@ fi # # Provide info for src/libassuan-config.in # -LIBASSUAN_CONFIG_LIB="-lassuan" +LIBASSUAN_CONFIG_LIBS="-lassuan" LIBASSUAN_CONFIG_CFLAGS="" LIBASSUAN_CONFIG_HOST="$host" -LIBASSUAN_CONFIG_EXTRA_LIBS= if test x"$NETLIBS" != x; then - LIBASSUAN_CONFIG_EXTRA_LIBS="$LIBASSUAN_CONFIG_EXTRA_LIBS $NETLIBS" + LIBASSUAN_CONFIG_LIBS="$LIBASSUAN_CONFIG_LIBS $NETLIBS" fi -AC_SUBST(LIBASSUAN_CONFIG_LIB) +AC_SUBST(LIBASSUAN_CONFIG_LIBS) AC_SUBST(LIBASSUAN_CONFIG_CFLAGS) AC_SUBST(LIBASSUAN_CONFIG_HOST) AC_SUBST(LIBASSUAN_CONFIG_API_VERSION) -AC_SUBST(LIBASSUAN_CONFIG_EXTRA_LIBS) # # Checks for header files. diff --git a/src/libassuan-config.in b/src/libassuan-config.in index 914c7ef..4659abc 100644 --- a/src/libassuan-config.in +++ b/src/libassuan-config.in @@ -15,8 +15,8 @@ gpg_error_cflags="@GPG_ERROR_CFLAGS@" gpg_error_libs="@GPG_ERROR_LIBS@" PGM=libassuan-config -lib="@LIBASSUAN_CONFIG_LIB@" -extralibs="@LIBASSUAN_CONFIG_EXTRA_LIBS@ $gpg_error_libs" +lib="@LIBASSUAN_CONFIG_LIBS@" +extralibs="$gpg_error_libs" cflags="@LIBASSUAN_CONFIG_CFLAGS@ $gpg_error_cflags" api_version="@LIBASSUAN_CONFIG_API_VERSION@" my_host="@LIBASSUAN_CONFIG_HOST@" diff --git a/src/libassuan.pc.in b/src/libassuan.pc.in index a5caac6..4e952d7 100644 --- a/src/libassuan.pc.in +++ b/src/libassuan.pc.in @@ -10,5 +10,5 @@ Description: IPC library for the GnuPG components Requires: gpg-error Version: @PACKAGE_VERSION@ Cflags: @LIBASSUAN_CONFIG_CFLAGS@ -Libs: @LIBASSUAN_CONFIG_LIBS@ @LIBASSUAN_CONFIG_EXTRA_LIBS@ +Libs: @LIBASSUAN_CONFIG_LIBS@ URL: https://www.gnupg.org/related_software/libassuan/index.html |