[Bug 10530] xdm's path to xrdb could be configurable at compile time

[Brice Goglin]

bugzilla-daemon at freedesktop.org wrote:
> commit 29dc5825782adf929bce41a18e6a6881ef975d22
> Author: Alan Coopersmith <alan.coopersmith at sun.com>
> Date:   Wed Jul 25 17:00:39 2007 -0700
>
>     Bug #10530: xdm's path to xrdb could be configurable at compile time
>
>     Add --with-xrdb=path & --with-default-session=command configure options
>     X.Org Bug #10530: <https://bugs.freedesktop.org/show_bug.cgi?id=10530>
>   


Hi Alan,

Aaron M. Ucko reports in [1] that xdm now looks for bindir/xrdb instead
of /usr/bin/xrdb. It looks like the above commit leads to
    #define XRDB_PROGRAM "bindir/xrdb"
by default instead of "/usr/local/bin/xrdb". As far as I understand
autoconf, the following patch seems to fix the problem.

Brice

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=437961


diff --git a/configure.ac b/configure.ac
index ec2debd..4a81c1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,14 +425,14 @@ AC_DEFINE_DIR(DEF_SERVER_LINE, DEF_SERVER_LINE,
 # -DXRDB_PROGRAM="$(BINDIR)/xrdb"
 AC_ARG_WITH(xrdb, AC_HELP_STRING([--with-xrdb=path],
 			[Use path for xrdb (default: bindir/xrdb)]),
-	    [XRDB=$withval], [XRDB=bindir/xrdb])
+	    [XRDB=$withval], [XRDB=${bindir}/xrdb])
 AC_DEFINE_DIR(XRDB_PROGRAM, XRDB, 
 	[Define to pathname for xrdb program])
 
 # -DDEF_SESSION="$(BINDIR)/xterm -ls"
 AC_ARG_WITH(default-session, AC_HELP_STRING([--with-default-session=command],
 		[Use command for default session (default: bindir/xterm -ls)]),
-	    [DEF_SESSION=$withval], [DEF_SESSION="bindir/xterm -ls"])
+	    [DEF_SESSION=$withval], [DEF_SESSION="${bindir}/xterm -ls"])
 AC_DEFINE_DIR(DEF_SESSION, DEF_SESSION,
 	[Define to default command to start X session])