From c2a5751175b11d3206805468aae1ddecd02c4a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Cardona?= Date: Sat, 3 Oct 2009 11:50:12 +0200 Subject: make XINITDIR configurable at build-time, default is unchanged MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémi Cardona --- Makefile.am | 2 -- configure.ac | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1a75f75..6dab021 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,6 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -XINITDIR = $(libdir)/X11/xinit - bin_PROGRAMS = xinit bin_SCRIPTS = startx diff --git a/configure.ac b/configure.ac index 485bd69..3e8ad50 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,7 @@ DEFAULT_XTERM=xterm 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]), @@ -98,6 +99,11 @@ AC_ARG_WITH(xinit, [XINIT="$withval"], [XINIT="$DEFAULT_XINIT"]) +AC_ARG_WITH(xinitdir, + AS_HELP_STRING([--with-xinitdir=XINITDIR], [Path to xinitdir]), + [XINITDIR="$withval"], + [XINITDIR="$DEFAULT_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}" ], @@ -189,6 +195,7 @@ AC_SUBST(XTERM) AC_SUBST(XSERVER) AC_SUBST(XAUTH) AC_SUBST(XINIT) +AC_SUBST(XINITDIR) AC_OUTPUT([Makefile]) AC_OUTPUT([privileged_startx/Makefile]) -- cgit v1.2.3