SOURCES: gnome-session-configure.patch - up for 2.16.2

[megabajt]

Author: megabajt                     Date: Thu Nov 30 18:53:16 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for 2.16.2

---- Files affected:
SOURCES:
   gnome-session-configure.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/gnome-session-configure.patch
diff -u SOURCES/gnome-session-configure.patch:1.1 SOURCES/gnome-session-configure.patch:1.2
--- SOURCES/gnome-session-configure.patch:1.1	Fri Jun  9 21:56:55 2006
+++ SOURCES/gnome-session-configure.patch	Thu Nov 30 19:53:11 2006
@@ -1,7 +1,29 @@
-diff -aurN gnome-session-2.15.1.orig/configure.in gnome-session-2.15.1/configure.in
---- gnome-session-2.15.1.orig/configure.in	2006-04-25 00:01:32.000000000 +0200
-+++ gnome-session-2.15.1/configure.in	2006-06-09 17:48:45.032674960 +0200
-@@ -100,28 +100,6 @@
+diff -urN gnome-session-2.16.2/configure.in gnome-session-2.16.2.new/configure.in
+--- gnome-session-2.16.2/configure.in	2006-11-20 15:07:45.000000000 +0100
++++ gnome-session-2.16.2.new/configure.in	2006-11-30 19:13:05.000000000 +0100
+@@ -65,21 +65,6 @@
+ 	ESOUND_MODULE="esound >= $ESOUND_REQUIRED"
+ 	PKG_CHECK_MODULES(ESOUND, $ESOUND_MODULE)
+ 	AC_DEFINE(HAVE_ESD, 1, [Define if you have the ESound Daemon])
+-
+-	ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound`
+-	old_path=$PATH
+-	if test x"$ESDSERVERDIR" != x; then
+-		PATH=$ESDSERVERDIR:$PATH
+-	fi
+-
+-	AC_PATH_PROG(ESD_SERVER, esd, no)
+-	if test x"$ESD_SERVER" = xno; then
+-		AC_MSG_ERROR([esd executable not found in your path - should be installed with ESound])
+-	fi
+-
+-	AC_SUBST(ESD_SERVER)
+-	PATH=$old_path
+-
+ else
+ 	ESOUND_MODULE=""
+ fi
+@@ -127,13 +112,6 @@
  
  AC_SUBST(GCONF_SANITY_CHECK)
  PATH=$old_path
@@ -12,21 +34,6 @@
 -fi
 -	
 -AC_SUBST(GNOME_KEYRING_DAEMON)
--
--# esd
--ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound`
--old_path=$PATH
--if test x"$ESDSERVERDIR" != x; then
--   PATH=$ESDSERVERDIR:$PATH
--fi
--
--AC_PATH_PROG(ESD_SERVER, esd, no)
--if test x"$ESD_SERVER" = xno; then
--  AC_MSG_ERROR([esd executable not found in your path - should be installed with ESound])
--fi
--
--AC_SUBST(ESD_SERVER)
--PATH=$old_path
  
  dnl X development libraries check
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/gnome-session-configure.patch?r1=1.1&r2=1.2&f=u