[PATCH app-xinit 3/6] config: remove one level of indirection for default values

[Gaetan Nadon]

The DEFAULT_* variables aren't used anywhere else.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac |   30 +++++++++---------------------
 1 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index bc46e05..971e923 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,62 +38,50 @@ XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 XORG_PROG_RAWCPP
 
-# Build options
-DEFAULT_XRDB=xrdb
-DEFAULT_XMODMAP=xmodmap
-DEFAULT_TWM=twm
-DEFAULT_XCLOCK=xclock
-DEFAULT_XTERM=xterm
-# You always want to specify the full path to the X server
-DEFAULT_XSERVER=${bindir}/X
-DEFAULT_XAUTH=xauth
-DEFAULT_XINIT=xinit
-DEFAULT_XINITDIR=${libdir}/X11/xinit
-
 AC_ARG_WITH(xrdb,
 	 AS_HELP_STRING([--with-xrdb=XRDB], [Path to xrdb]),
 	[XRDB="$withval"],
-	[XRDB="$DEFAULT_XRDB"])
+	[XRDB=xrdb])
 
 AC_ARG_WITH(xmodmap,
 	 AS_HELP_STRING([--with-xmodmap=XMODMAP], [Path to xmodmap]),
 	[XMODMAP="$withval"],
-	[XMODMAP="$DEFAULT_XMODMAP"])
+	[XMODMAP=xmodmap])
 
 AC_ARG_WITH(twm,
 	 AS_HELP_STRING([--with-twm=TWM], [Path to twm]),
 	[TWM="$withval"],
-	[TWM="$DEFAULT_TWM"])
+	[TWM=twm])
 
 AC_ARG_WITH(xclock,
 	 AS_HELP_STRING([--with-xclock=XCLOCK], [Path to xclock]),
 	[XCLOCK="$withval"],
-	[XCLOCK="$DEFAULT_XCLOCK"])
+	[XCLOCK=xclock])
 
 AC_ARG_WITH(xterm,
 	 AS_HELP_STRING([--with-xterm=XTERM], [Path to xterm]),
 	[XTERM="$withval"],
-	[XTERM="$DEFAULT_XTERM"])
+	[XTERM=xterm])
 
 AC_ARG_WITH(xserver,
 	 AS_HELP_STRING([--with-xserver=XSERVER], [Path to default X server]),
 	[XSERVER="$withval"],
-	[XSERVER="$DEFAULT_XSERVER"])
+	[XSERVER=${bindir}/X])
 
 AC_ARG_WITH(xauth,
 	 AS_HELP_STRING([--with-xauth=XAUTH], [Path to xauth]),
 	[XAUTH="$withval"],
-	[XAUTH="$DEFAULT_XAUTH"])
+	[XAUTH=xauth])
 
 AC_ARG_WITH(xinit,
 	 AS_HELP_STRING([--with-xinit=XINIT], [Path to xinit]),
 	[XINIT="$withval"],
-	[XINIT="$DEFAULT_XINIT"])
+	[XINIT=xinit])
 
 AC_ARG_WITH(xinitdir,
 	 AS_HELP_STRING([--with-xinitdir=XINITDIR], [Path to xinitdir]),
 	[XINITDIR="$withval"],
-	[XINITDIR="$DEFAULT_XINITDIR"])
+	[XINITDIR=${libdir}/X11/xinit])
 
 AC_ARG_WITH(launchd,            AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
 AC_ARG_WITH(launchagents-dir,   AS_HELP_STRING([--with-launchagents-dir=PATH], [Path to launchd's LaunchAgents directory (default: /Library/LaunchAgents)]),
-- 
1.6.0.4