[PATCH app-xinit 4/6] config: regroup the code for each configuration option

[Gaetan Nadon]

No functional changes.

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

diff --git a/configure.ac b/configure.ac
index 971e923..c2cdf55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,60 +39,68 @@ XORG_DEFAULT_OPTIONS
 XORG_PROG_RAWCPP
 
 AC_ARG_WITH(xrdb,
-	 AS_HELP_STRING([--with-xrdb=XRDB], [Path to xrdb]),
-	[XRDB="$withval"],
-	[XRDB=xrdb])
+	AS_HELP_STRING([--with-xrdb=XRDB], [Path to xrdb]),
+	[XRDB="$withval"], [XRDB=xrdb])
+AC_SUBST(XRDB)
 
 AC_ARG_WITH(xmodmap,
-	 AS_HELP_STRING([--with-xmodmap=XMODMAP], [Path to xmodmap]),
-	[XMODMAP="$withval"],
-	[XMODMAP=xmodmap])
+	AS_HELP_STRING([--with-xmodmap=XMODMAP], [Path to xmodmap]),
+	[XMODMAP="$withval"], [XMODMAP=xmodmap])
+AC_SUBST(XMODMAP)
 
 AC_ARG_WITH(twm,
-	 AS_HELP_STRING([--with-twm=TWM], [Path to twm]),
-	[TWM="$withval"],
-	[TWM=twm])
+	AS_HELP_STRING([--with-twm=TWM], [Path to twm]),
+	[TWM="$withval"], [TWM=twm])
+AC_SUBST(TWM)
 
 AC_ARG_WITH(xclock,
-	 AS_HELP_STRING([--with-xclock=XCLOCK], [Path to xclock]),
-	[XCLOCK="$withval"],
-	[XCLOCK=xclock])
+	AS_HELP_STRING([--with-xclock=XCLOCK], [Path to xclock]),
+	[XCLOCK="$withval"], [XCLOCK=xclock])
+AC_SUBST(XCLOCK)
 
 AC_ARG_WITH(xterm,
-	 AS_HELP_STRING([--with-xterm=XTERM], [Path to xterm]),
-	[XTERM="$withval"],
-	[XTERM=xterm])
+	AS_HELP_STRING([--with-xterm=XTERM], [Path to xterm]),
+	[XTERM="$withval"], [XTERM=xterm])
+AC_SUBST(XTERM)
 
 AC_ARG_WITH(xserver,
-	 AS_HELP_STRING([--with-xserver=XSERVER], [Path to default X server]),
-	[XSERVER="$withval"],
-	[XSERVER=${bindir}/X])
+	AS_HELP_STRING([--with-xserver=XSERVER], [Path to default X server]),
+	[XSERVER="$withval"], [XSERVER=${bindir}/X])
+AC_SUBST(XSERVER)
 
 AC_ARG_WITH(xauth,
-	 AS_HELP_STRING([--with-xauth=XAUTH], [Path to xauth]),
-	[XAUTH="$withval"],
-	[XAUTH=xauth])
+	AS_HELP_STRING([--with-xauth=XAUTH], [Path to xauth]),
+	[XAUTH="$withval"], [XAUTH=xauth])
+AC_SUBST(XAUTH)
 
 AC_ARG_WITH(xinit,
-	 AS_HELP_STRING([--with-xinit=XINIT], [Path to xinit]),
-	[XINIT="$withval"],
-	[XINIT=xinit])
+	AS_HELP_STRING([--with-xinit=XINIT], [Path to xinit]),
+	[XINIT="$withval"], [XINIT=xinit])
+AC_SUBST(XINIT)
 
 AC_ARG_WITH(xinitdir,
-	 AS_HELP_STRING([--with-xinitdir=XINITDIR], [Path to xinitdir]),
-	[XINITDIR="$withval"],
-	[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)]),
-                                [ launchagentsdir="${withval}" ],
-                                [ launchagentsdir="/Library/LaunchAgents" ])
-AC_ARG_WITH(launchdaemons-dir,  AS_HELP_STRING([--with-launchdaemons-dir=PATH], [Path to launchd's LaunchDaemonss directory (default: /Library/LaunchDaemons)]),
-                                [ launchdaemonsdir="${withval}" ],
-                                [ launchdaemonsdir="/Library/LaunchDaemons" ])
-AC_ARG_WITH(launchd-id-prefix,  AS_HELP_STRING([--with-launchd-id-prefix=PATH], [Prefix to use for launchd identifiers (default: org.x)]),
-                                [ launchdidprefix="${withval}" ],
-                                [ launchdidprefix="org.x" ])
+	AS_HELP_STRING([--with-xinitdir=XINITDIR], [Path to xinitdir]),
+	[XINITDIR="$withval"], [XINITDIR=${libdir}/X11/xinit])
+AC_SUBST(XINITDIR)
+
+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)]),
+	[ launchagentsdir="${withval}" ], [ launchagentsdir="/Library/LaunchAgents" ])
+AC_SUBST([launchagentsdir])
+
+AC_ARG_WITH(launchdaemons-dir,
+	AS_HELP_STRING([--with-launchdaemons-dir=PATH], [Path to launchd's LaunchDaemonss directory (default: /Library/LaunchDaemons)]),
+	[ launchdaemonsdir="${withval}" ], [ launchdaemonsdir="/Library/LaunchDaemons" ])
+AC_SUBST([launchdaemonsdir])
+
+AC_ARG_WITH(launchd-id-prefix,
+	AS_HELP_STRING([--with-launchd-id-prefix=PATH], [Prefix to use for launchd identifiers (default: org.x)]),
+	[ launchdidprefix="${withval}" ], [ launchdidprefix="org.x" ])
+AC_SUBST([launchdidprefix])
 
 if test "x$LAUNCHD" = "xauto"; then
 	unset LAUNCHD
@@ -113,9 +121,6 @@ else
 fi
 
 AC_DEFINE_UNQUOTED(LAUNCHD_ID_PREFIX, "$launchdidprefix", [Prefix to use for launchd identifiers])
-AC_SUBST([launchagentsdir])
-AC_SUBST([launchdaemonsdir])
-AC_SUBST([launchdidprefix])
 AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"])
 AM_CONDITIONAL(TIGER_LAUNCHD, [test "x$TIGER_LAUNCHD" = "xyes"])
 
@@ -175,15 +180,6 @@ AC_SUBST(XSERVERNAME)
 AC_SUBST(XCONFIGFILE)
 AC_SUBST(XCONFIGFILEMAN)
 
-AC_SUBST(XRDB)
-AC_SUBST(XMODMAP)
-AC_SUBST(TWM)
-AC_SUBST(XCLOCK)
-AC_SUBST(XTERM)
-AC_SUBST(XSERVER)
-AC_SUBST(XAUTH)
-AC_SUBST(XINIT)
-AC_SUBST(XINITDIR)
 
 AC_CONFIG_FILES([Makefile
 	man/Makefile
-- 
1.6.0.4