? remove_hard_x_paths.patch
Index: configure.in
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/configure.in,v
retrieving revision 1.47
diff -u -r1.47 configure.in
--- configure.in	12 Jan 2006 05:43:07 -0000	1.47
+++ configure.in	8 Mar 2006 15:25:35 -0000
@@ -31,6 +31,21 @@
 packagesrcdir=`cd $srcdir && pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Program source directory])
 
+dnl Set path to X_BINARIES in config.h
+xbin=""
+AC_ARG_WITH(xbin,
+						[ --with-xbin=PFX			Prefix where X binaries are installed ],
+						[
+						 	xbin=$withval;
+							echo "using "$xbin" for xbin directory.";
+						],
+						[
+						 xbin="/usr/X11R6/bin";
+						 ]
+						)
+AC_DEFINE_UNQUOTED(X_BINARIES, "${xbin}", [Path to X binaries])
+AC_SUBST(xbin)
+
 dnl Use -Wall if we have gcc.
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
@@ -189,6 +204,7 @@
 echo "Support for shadow authentication ... $have_shadow"
 echo "Support for PAM authentication ...... $have_pam"
 echo "XSession file to use ................ $xsession "
+echo "X binaries prefix  .................. $xbin"
 echo
 echo "Now type 'make' (gmake on some systems) to compile $PACKAGE"
 echo
Index: data/config/autodetect.sh.in
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/config/autodetect.sh.in,v
retrieving revision 1.1
diff -u -r1.1 autodetect.sh.in
--- data/config/autodetect.sh.in	5 Jan 2006 17:23:27 -0000	1.1
+++ data/config/autodetect.sh.in	8 Mar 2006 15:25:35 -0000
@@ -47,11 +47,11 @@
 
 You could pick a vt manually and run this command (assuming you picked vt7) -
 
-sudo ecore_config -c $DB -k /entranced/xserver -s \"/usr/X11R6/bin/X -quiet -nolisten tcp vt7\"
+sudo ecore_config -c $DB -k /entranced/xserver -s \"@xbin@/X -quiet -nolisten tcp vt7\"
 "
   else
     echo "Setting the X virtual terminal to vt$found."
-    sudo ecore_config -c $DB -k /entranced/xserver -s "/usr/X11R6/bin/X -quiet -nolisten tcp vt$found"
+    sudo ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -nolisten tcp vt$found"
   fi
 )
 echo ""
Index: data/config/build_config.sh.in
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/config/build_config.sh.in,v
retrieving revision 1.18
diff -u -r1.18 build_config.sh.in
--- data/config/build_config.sh.in	17 Dec 2005 00:50:45 -0000	1.18
+++ data/config/build_config.sh.in	8 Mar 2006 15:25:35 -0000
@@ -50,5 +50,5 @@
 ecore_config -c $DB -k /entrance/presel/mode -i 1
 
 # for Entranced
-ecore_config -c $DB -k /entranced/xserver -s "/usr/X11R6/bin/X -quiet -nolisten tcp"
+ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -nolisten tcp"
 ecore_config -c $DB -k /entranced/attempts -i 5
Index: src/client/entrance_session.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.c,v
retrieving revision 1.80
diff -u -r1.80 entrance_session.c
--- src/client/entrance_session.c	10 Dec 2005 05:55:09 -0000	1.80
+++ src/client/entrance_session.c	8 Mar 2006 15:25:42 -0000
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "entrance.h"
 #include "entrance_session.h"
 #include <Ecore_Config.h>
@@ -403,7 +404,7 @@
    {
       printf("Would have executed: %s\n", buf);
       fflush(stdout);
-      snprintf(buf, PATH_MAX, "/usr/X11R6/bin/xterm");
+      snprintf(buf, PATH_MAX, X_BINARIES"/xterm");
    }
 
    syslog(LOG_INFO, "Executing %s", buf);
Index: src/daemon/Entranced.h
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/Entranced.h,v
retrieving revision 1.10
diff -u -r1.10 Entranced.h
--- src/daemon/Entranced.h	9 Dec 2005 14:00:11 -0000	1.10
+++ src/daemon/Entranced.h	8 Mar 2006 15:25:42 -0000
@@ -19,8 +19,8 @@
 
 #define ENTRANCED_DEBUG 1
 
-#define DEFAULT_X_SERVER "/usr/X11R6/bin/X -quiet -nolisten tcp"
-//#define X_SERVER "/usr/X11R6/bin/Xnest -full"
+#define DEFAULT_X_SERVER X_BINARIES"/X -quiet -nolisten tcp"
+//#define X_SERVER X_BINARIES"/Xnest -full"
 #define X_DISP ":0"             /* only used if DISPLAY variable is NOT set */
 #define ENTRANCE PREFIX "/bin/entrance_wrapper"
 #define PIDFILE "/var/run/entranced.pid"