[git] Assuan - branch, master, updated. libassuan-2.5.1-14-g1dd2430

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPC library used by GnuPG".

The branch, master has been updated
       via  1dd2430d8877ffda43bc46f0d5f23fea4801ecf6 (commit)
      from  27f4671883e3241ac0fdee3935c8707c816686b6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1dd2430d8877ffda43bc46f0d5f23fea4801ecf6
Author: NIIBE Yutaka <[email protected]>
Date:   Thu Oct 25 18:11:26 2018 +0900

    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 <[email protected]>

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

-----------------------------------------------------------------------

Summary of changes:
 configure.ac            | 8 +++-----
 src/libassuan-config.in | 4 ++--
 src/libassuan.pc.in     | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
IPC library used by GnuPG
http://git.gnupg.org