[git] GPG-ERROR - branch, master, updated. libgpg-error-1.32-32-g00e9555

[by NIIBE Yutaka]

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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  00e955558c66f80acad9225d2eae82459d87dc54 (commit)
      from  f575b2fd3f733d78fb61b04805ea63ce65d89e19 (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 00e955558c66f80acad9225d2eae82459d87dc54
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Oct 23 15:36:15 2018 +0900

    build: Fix detecting build on multiarch environment.
    
    * configure.ac: Rough match by shell pattern.
    
    --
    
    Since libdir is i386-linux-gnu on Debian i686-linux-gnu machine,
    exact match to host_alias didn't work.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/configure.ac b/configure.ac
index 25719d4..b735fa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -651,13 +651,16 @@ AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],
                      build_tests=$enableval, build_tests=yes)
 AM_CONDITIONAL([BUILD_TESTS], [test "x$build_tests" != xno])
 
-if expr $libdir : ".*/$host_alias\$" >/dev/null; then
-  # Looks like it's multiarch, then,
-  # let the script detect host architecture at runtime
-  pkg_config_libdir=auto
-else
-  pkg_config_libdir=$libdir/pkgconfig
-fi
+case "$libdir" in
+  */*-*-*)
+    # Looks like it's multiarch, then,
+    # let the script detect host architecture at runtime
+    pkg_config_libdir=auto
+    ;;
+  *)
+    pkg_config_libdir=$libdir/pkgconfig
+    ;;
+esac
 AC_SUBST(pkg_config_libdir)
 #
 # Substitution

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

Summary of changes:
 configure.ac | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org