qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reduce diffs with upstream. No functional change.

Browse Source
This commit is contained in:
matthieu 2014-08-28 17:34:29 +00:00
parent 4f157902c5
commit d30eea2426
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/xinit/configure.ac
View File

@ -31,10 +31,10 @@ AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for AC_PROG_SED in XORG_DEFAULT_OPTIONS
# Require X.Org macros 1.19 or later for TRADITIONALCPPFLAGS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
[m4_fatal([must install xorg-macros 1.19 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.19)
XORG_DEFAULT_OPTIONS
XORG_PROG_RAWCPP
@ -50,8 +50,8 @@ DEFAULT_XTERM=xterm
DEFAULT_XSERVER=${bindir}/X
DEFAULT_XAUTH=xauth
DEFAULT_XINIT=xinit
DEFAULT_WM=fvwm
DEFAULT_XINITDIR=${sysconfdir}/X11/xinit
DEFAULT_WM=fvwm
DEFAULT_XCONSOLE=xconsole
AC_ARG_WITH(xrdb,
@ -94,6 +94,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(wm,
AS_HELP_STRING([--with-wm=WM], [Path to default window manager]),
[WM="$withval"],
@ -104,11 +109,6 @@ AC_ARG_WITH(xconsole,
[XCONSOLE="$withval"],
[XCONSOLE="$DEFAULT_XCONSOLE"])
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}" ],
@ -225,11 +225,10 @@ AC_SUBST(XTERM)
AC_SUBST(XSERVER)
AC_SUBST(XAUTH)
AC_SUBST(XINIT)
AC_SUBST(XINITDIR)
AC_SUBST(WM)
AC_SUBST(XCONSOLE)
AC_SUBST(XINITDIR)
AC_CONFIG_FILES([Makefile
man/Makefile
launchd/Makefile