ports/121482: gnome-session build fails when esd is a symlink to esd-compat

[Eric Anholt]

>Number:         121482
>Category:       ports
>Synopsis:       gnome-session build fails when esd is a symlink to esd-compat
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 07 23:30:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Eric Anholt
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD vonnegut.anholt.net 8.0-CURRENT FreeBSD 8.0-CURRENT #2: Thu Nov 22 16:25:57 PST 2007 root at vonnegut.anholt.net:/usr/obj/usr/src/sys/MYKERNEL i386


	
>Description:
	The autoconf test for /usr/local/bin/esd checks for it being a normal
	file or something, as configure fails when it's a symlink.  As a
	workaround, we can hand configure the path to esd, in which case it
	doesn't do the test.

>How-To-Repeat:
	
>Fix:

	

--- gnome-session-pa-fix begins here ---
commit 7be413638db7b283f179e38c80e2109a8f525f96
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Mar 7 12:20:03 2008 -0800

    Add a workaround for autoconf test not finding esd when it's a symlink.
    
    The esd symlink is used to get gnome-session to start esd-compat when
    pulseaudio is installed, since gnome-session doesn't do any autodetection.
    An alternative would be to fix gnome-session to choose
    ${LOCALBASE}/bin/esd-compat if available at runtime.

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index fede943..f675492 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -35,7 +35,8 @@ GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		ESD_SERVER="${LOCALBASE}/bin/esd"
 
 MAN1=		gnome-session.1 gnome-wm.1 session-properties.1 \
 		gnome-session-save.1
--- gnome-session-pa-fix ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: