summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2007-07-25 17:00:39 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2007-07-25 17:00:39 -0700
commit29dc5825782adf929bce41a18e6a6881ef975d22 (patch)
tree59f1ac3d3cd6846dea730340e5de86dc1a1726c5
parent2719e18c3782c5b21f712711b4198a5bb55f5473 (diff)
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>
-rw-r--r--configure.ac10
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 8a4911e..8f69423 100644
--- a/configure.ac
+++ b/configure.ac
@@ -422,11 +422,17 @@ AC_DEFINE_DIR(DEF_SERVER_LINE, DEF_SERVER_LINE,
[Define to default Xserver file entry for local X server])
# -DXRDB_PROGRAM="$(BINDIR)/xrdb"
-AC_DEFINE_DIR(XRDB_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])
+AC_DEFINE_DIR(XRDB_PROGRAM, XRDB,
[Define to pathname for xrdb program])
# -DDEF_SESSION="$(BINDIR)/xterm -ls"
-AC_DEFINE_DIR(DEF_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"])
+AC_DEFINE_DIR(DEF_SESSION, DEF_SESSION,
[Define to default command to start X session])
# -DDEF_USER_PATH="$(DEF_USER_PATH)"