[pulseaudio-commits] 2 commits - configure.ac Makefile.am src/modules

[Arun Raghavan]

 Makefile.am                                    |    2 +-
 configure.ac                                   |   17 ++++++-----------
 src/modules/bluetooth/module-bluez4-discover.c |    8 ++++----
 src/modules/gconf/module-gconf.c               |   14 +++++++-------
 4 files changed, 18 insertions(+), 23 deletions(-)

New commits:
commit 954503d07401102d536a1214ed5bae2588f5d7b8
Author: Shawn Walker <shawn.walker at oracle.com>
Date:   Wed Jul 29 08:09:41 2015 +0530

    modules: Fix struct namespace collision on Solaris

diff --git a/src/modules/bluetooth/module-bluez4-discover.c b/src/modules/bluetooth/module-bluez4-discover.c
index e09ecba..e39036a 100644
--- a/src/modules/bluetooth/module-bluez4-discover.c
+++ b/src/modules/bluetooth/module-bluez4-discover.c
@@ -58,13 +58,13 @@ struct userdata {
     pa_hashmap *hashmap;
 };
 
-struct module_info {
+struct pa_module_info {
     char *path;
     uint32_t module;
 };
 
 static pa_hook_result_t load_module_for_device(pa_bluez4_discovery *y, const pa_bluez4_device *d, struct userdata *u) {
-    struct module_info *mi;
+    struct pa_module_info *mi;
 
     pa_assert(u);
     pa_assert(d);
@@ -97,7 +97,7 @@ static pa_hook_result_t load_module_for_device(pa_bluez4_discovery *y, const pa_
             pa_xfree(args);
 
             if (m) {
-                mi = pa_xnew(struct module_info, 1);
+                mi = pa_xnew(struct pa_module_info, 1);
                 mi->module = m->index;
                 mi->path = pa_xstrdup(d->path);
 
@@ -175,7 +175,7 @@ void pa__done(pa_module* m) {
         pa_bluez4_discovery_unref(u->discovery);
 
     if (u->hashmap) {
-        struct module_info *mi;
+        struct pa_module_info *mi;
 
         while ((mi = pa_hashmap_steal_first(u->hashmap))) {
             pa_xfree(mi->path);
diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c
index fa5788c..1e1b855 100644
--- a/src/modules/gconf/module-gconf.c
+++ b/src/modules/gconf/module-gconf.c
@@ -56,7 +56,7 @@ struct module_item {
     uint32_t index;
 };
 
-struct module_info {
+struct pa_module_info {
     struct userdata *userdata;
     char *name;
 
@@ -129,7 +129,7 @@ static char *read_string(struct userdata *u) {
     }
 }
 
-static void unload_one_module(struct module_info *m, unsigned i) {
+static void unload_one_module(struct pa_module_info *m, unsigned i) {
     struct userdata *u;
 
     pa_assert(m);
@@ -148,7 +148,7 @@ static void unload_one_module(struct module_info *m, unsigned i) {
     m->items[i].name = m->items[i].args = NULL;
 }
 
-static void unload_all_modules(struct module_info *m) {
+static void unload_all_modules(struct pa_module_info *m) {
     unsigned i;
 
     pa_assert(m);
@@ -160,7 +160,7 @@ static void unload_all_modules(struct module_info *m) {
 }
 
 static void load_module(
-        struct module_info *m,
+        struct pa_module_info *m,
         unsigned i,
         const char *name,
         const char *args,
@@ -199,7 +199,7 @@ static void load_module(
 }
 
 static void module_info_free(void *p) {
-    struct module_info *m = p;
+    struct pa_module_info *m = p;
 
     pa_assert(m);
 
@@ -227,14 +227,14 @@ static int handle_event(struct userdata *u) {
 
             case '+': {
                 char *name;
-                struct module_info *m;
+                struct pa_module_info *m;
                 unsigned i, j;
 
                 if (!(name = read_string(u)))
                     goto fail;
 
                 if (!(m = pa_hashmap_get(u->module_infos, name))) {
-                    m = pa_xnew(struct module_info, 1);
+                    m = pa_xnew(struct pa_module_info, 1);
                     m->userdata = u;
                     m->name = name;
                     m->n_items = 0;

commit 344770389eb39c15f61a1dd12327287285a83359
Author: Arun Raghavan <git at arunraghavan.net>
Date:   Tue Jul 28 10:09:20 2015 +0530

    build-sys: Fix up setting the bash completion dir
    
    This makes setting up the bash completion dir consistent with the other
    cases that we need to deal with, and also handles distcheck correctly.

diff --git a/Makefile.am b/Makefile.am
index 887cbe5..899ad7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,4 +113,4 @@ $(top_srcdir)/.version:
 DISTCLEANFILES = \
         po/.intltool-merge-cache
 
-DISTCHECK_CONFIGURE_FLAGS = --with-udev-rules-dir="$$dc_install_base/lib/udev/rules.d" --with-systemduserunitdir="$$dc_install_base/lib/systemd/user"
+DISTCHECK_CONFIGURE_FLAGS = --with-udev-rules-dir="$$dc_install_base/lib/udev/rules.d" --with-systemduserunitdir="$$dc_install_base/lib/systemd/user" --with-bash-completion-dir="$$dc_install_base/share/bash-completion/completions"
diff --git a/configure.ac b/configure.ac
index 9e65684..e8a2de3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1436,17 +1436,12 @@ AC_ARG_WITH(
 
 AC_SUBST(udevrulesdir)
 
-# PKG_CHECK_VAR available with pkg-config 0.28
-AC_DEFUN([PKG_CHECK_VAR],
-        [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-        AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-        _PKG_CONFIG([$1], [variable="][$3]["], [$2])
-        AS_VAR_COPY([$1], [pkg_cv_][$1])
-        AS_VAR_IF([$1], [""], [$5], [$4])dnl
-        ])
-
-PKG_CHECK_VAR(bashcompletiondir, [bash-completion], [completionsdir], ,
-    bashcompletiondir="${sysconfdir}/bash_completion.d")
+AC_ARG_WITH([bash-completion-dir],
+        AS_HELP_STRING([--with-bash-completion-dir=DIR], [Directory for bash completion files]),
+        [bashcompletiondir=$withval], [bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)])
+if test "x$bashcompletionsdir" = ""; then
+	bashcompletiondir="${datadir}/bash-completion/completions"
+fi
 
 AC_SUBST(bashcompletiondir)