[glib] build: Include $host_cpu in tapset directory

[Philip Withnall <pwithnall src gnome org>]

commit 030efac0777cdc3330d3afa12dafa95f6449e14b
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Wed Jun 29 14:59:59 2016 +0100

    build: Include $host_cpu in tapset directory
    
    SystemTap tapsets are architecture-specific, as they include the full
    path to the .so file for each probe they reference. Hence, we should
    install them in an architecture-specific path, or multiarch systems will
    suffer from collisions between them.
    
    A better long-term solution, using $libdir rather than the
    non-architecture-specific $datadir, is under discussion upstream:
    https://sourceware.org/bugzilla/show_bug.cgi?id=20264; but this will do
    for now.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=662802

 configure.ac |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0b7ee95..8eb5795 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2554,13 +2554,13 @@ AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$have_systemtap = xyes])
 
 AC_ARG_WITH([tapset-install-dir],
             AS_HELP_STRING([--with-tapset-install-dir=DIR],
-                            [path where systemtap tapsets are installed [DATADIR/systemtap/tapset]]),
+                            [path where systemtap tapsets are installed 
[DATADIR/systemtap/tapset/HOST_CPU]]),
             [if test "x${withval}" = x; then
-              ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"
+              ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset/${host_cpu}"
             else
               ABS_TAPSET_DIR="${withval}"
              fi],
-           [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"])
+           [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset/${host_cpu}"])
 AC_SUBST(ABS_TAPSET_DIR)
 
 dnl ************************************