[sabayon] Commit: Detect and use location of Xnest

[William Lachance <wrlach gmail com>]

It seems that the latest iteration of Ubuntu (Dapper Drake) has moved Xnest from '/usr/X11R6/bin' to '/usr/bin', and the rest of the world is about to follow suit. The following (already committed) patch uses an autoconf rule to check the real location of Xnest at configure time, then use it when Sabayon is run. 

I also took the liberty of making the absence of Xnest at configure-time an error, as otherwise it would be easily possible to create a sabayon package which wouldn't actually work on a target system.

-- 
William Lachance
wrlach gmail com
? depcomp
? dumpster
? py-compile
? xnest-variable-location.patch
? admin-tool/semantic.cache
? lib/semantic.cache
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/sabayon/ChangeLog,v
retrieving revision 1.311
diff -u -r1.311 ChangeLog
--- ChangeLog	20 Dec 2005 06:52:52 -0000	1.311
+++ ChangeLog	29 Dec 2005 05:18:45 -0000
@@ -1,3 +1,10 @@
+2005-12-28  William Lachance <wrlach gmail com>
+
+	* configure.ac lib/config.py.in lib/Makefile.am: 
+	Don't assume that the Xnest binary is '/usr/X11R6/bin/Xnest':
+	detect its location automatically. Also make configure fail if
+	we can't find it, since it no longer has a canonical location.
+
 2005-12-20  Ankit Patel  <ankit644 yahoo com>
 
         * configure.ac: Added 'gu' to ALL_LINGUAS.
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/sabayon/configure.ac,v
retrieving revision 1.56
diff -u -r1.56 configure.ac
--- configure.ac	20 Dec 2005 06:52:52 -0000	1.56
+++ configure.ac	29 Dec 2005 05:18:45 -0000
@@ -225,10 +225,12 @@
   SABAYON_DIR_TMP="$bindir"
 fi
 
-AC_CHECK_PROG(XNEST,Xnest,yes,no)
-if test "x$XNEST" = "xno" ; then
-  AC_MSG_WARN(xnest binary not found)
+AC_PATH_PROG(XNEST_PATH,Xnest,no)
+if test "x$XNEST_PATH" = "xno" ; then
+  AC_MSG_ERROR(Xnest binary not found)
 fi
+AC_SUBST(XNEST_PATH)
+
 
 EXPANDED_SABAYON_DIR=`eval echo $SABAYON_DIR_TMP`
 AC_SUBST(EXPANDED_SABAYON_DIR)
Index: lib/Makefile.am
===================================================================
RCS file: /cvs/gnome/sabayon/lib/Makefile.am,v
retrieving revision 1.22
diff -u -r1.22 Makefile.am
--- lib/Makefile.am	2 Nov 2005 10:39:01 -0000	1.22
+++ lib/Makefile.am	29 Dec 2005 05:18:46 -0000
@@ -62,6 +62,7 @@
                 -e s!\ PACKAGE_NAME\@!$(PACKAGE_NAME)!		\
                 -e s!\ PACKAGE_VERSION\@!$(PACKAGE_VERSION)!	\
 		-e s!\ XSESSION\@!$(XSESSION)!			\
+		-e s!\ XNEST_PATH\@!$(XNEST_PATH)!		\
 		-e s!\ SESSION_NAME\@!$(SESSION_NAME)!		\
 		-e s!\ PROTOTYPE_USER\@!$(PROTOTYPE_USER)!	\
                 < $< > $@
Index: lib/config.py.in
===================================================================
RCS file: /cvs/gnome/sabayon/lib/config.py.in,v
retrieving revision 1.48
diff -u -r1.48 config.py.in
--- lib/config.py.in	7 Nov 2005 15:48:55 -0000	1.48
+++ lib/config.py.in	29 Dec 2005 05:18:46 -0000
@@ -53,7 +53,7 @@
 NOLOGIN_SHELL = "/sbin/nologin"
 SKEL_HOMEDIR  = "/etc/skel"
 
-XNEST_ARGV   = [ "/usr/X11R6/bin/Xnest", "-terminate", "-audit", "0", "-nolisten", "tcp" ]
+XNEST_ARGV   = [ "@XNEST_PATH@", "-terminate", "-audit", "0", "-nolisten", "tcp" ]
 SESSION_ARGV = [ "@XSESSION@", "@SESSION_NAME@" ]
 USERMOD_ARGV = [ "/usr/sbin/usermod" ]