[pulseaudio-discuss] [pulseaudio-commits] r2048 - in /trunk: configure.ac src/ src/Makefile.am src/modules/bt-proximity-helper.c src/modules/module-bt-proximity.c

[Jan-Benedict Glaw]

On Sun, 2007-11-11 23:18:22 -0000, svnmailer-noreply at 0pointer.de <svnmailer-noreply at 0pointer.de> wrote:
> New Revision: 2048
> URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2048&root=pulseaudio&view=rev

This won't properly build /and/ install unless you have the BlueZ
stuff installed.

> --- trunk/src/Makefile.am (original)
> +++ trunk/src/Makefile.am Mon Nov 12 00:18:19 2007
[...]
> @@ -1069,6 +1072,14 @@
>  modlibexec_LTLIBRARIES += \
>  		libdbus-util.la \
>  		module-hal-detect.la
> +endif
> +
> +if HAVE_BLUEZ
> +modlibexec_LTLIBRARIES += \
> +		module-bt-proximity.la
> +
> +pulselibexec_PROGRAMS += \
> +		bt-proximity-helper
>  endif
>  
>  # These are generated by a M4 script
[...]
> @@ -1455,6 +1478,7 @@
>  install-exec-hook:
>  	chown root $(DESTDIR)$(bindir)/pulseaudio ; true
>  	chmod u+s $(DESTDIR)$(bindir)/pulseaudio
> +	chmod u+s $(DESTDIR)$(pulselibexecdir)/bt-proximity-helper
>  	ln -sf pacat $(DESTDIR)$(bindir)/parec
>  	rm -f $(DESTDIR)$(modlibexecdir)/*.a
>  	rm -f $(DESTDIR)$(libdir)/libpulsedsp.a

This chmod isn't protected. The program isn't there if the BlueZ
development stuff isn't installed. Suggested patch (alike the example
two lines above):

Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 2048)
+++ src/Makefile.am	(working copy)
@@ -1478,7 +1478,7 @@
 install-exec-hook:
 	chown root $(DESTDIR)$(bindir)/pulseaudio ; true
 	chmod u+s $(DESTDIR)$(bindir)/pulseaudio
-	chmod u+s $(DESTDIR)$(pulselibexecdir)/bt-proximity-helper
+	chmod u+s $(DESTDIR)$(pulselibexecdir)/bt-proximity-helper ; true
 	ln -sf pacat $(DESTDIR)$(bindir)/parec
 	rm -f $(DESTDIR)$(modlibexecdir)/*.a
 	rm -f $(DESTDIR)$(libdir)/libpulsedsp.a

MfG, JBG

-- 
      Jan-Benedict Glaw      jbglaw at lug-owl.de              +49-172-7608481
 Signature of:                      http://perl.plover.com/Questions.html
 the second  :
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/pulseaudio-discuss/attachments/20071112/b1f155b0/attachment.pgp>