diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 18 |
3 files changed, 38 insertions, 3 deletions
@@ -1,3 +1,15 @@ +2005-11-09 Alan Coopersmith <alan.coopersmith@sun.com> + + * configure.ac: + Add settings for SHELL_CMD & ARCHMANDEFS to match monolith + changes for bug #3180. + + AC_DEFINE(XORG,...) so it is listed as available server in xinit + help output. + + * Makefile.am: + Update cpp -D flags to match monolith changes for bug #3180. + 2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/Makefile.am b/Makefile.am index 132a2c8..26f0c0b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,8 @@ MANDEFS = \ -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ -D__XSERVERNAME__=Xorg -D__XCONFIGFILE__=xorg.conf \ - -D__xinitdir__=$(XINITDIR) + -D__xinitdir__=$(XINITDIR) \ + -DSHELL_CMD=$(SHELL_CMD) $(ARCHMANDEFS) SUFFIXES = .$(APP_MAN_SUFFIX) .man @@ -72,11 +73,15 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man xinitrcdir = $(XINITDIR) +SCRIPTDEFS = \ + -DXINITDIR=$(XINITDIR) -DBINDIR=$(bindir) -DLIBDIR=$(libdir) \ + -DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) + xinitrc: xinitrc.cpp - $(RAWCPP) -DXINITDIR=$(XINITDIR) < $(srcdir)/xinitrc.cpp | $(CPP_SED_MAGIC) > $@ + $(RAWCPP) $(SCRIPTDEFS) < $(srcdir)/xinitrc.cpp | $(CPP_SED_MAGIC) > $@ startx: startx.cpp Makefile - $(RAWCPP) -DXINITDIR=$(XINITDIR) -DBINDIR=$(bindir) $(STARTX_COOKIE_FLAGS) $(srcdir)/startx.cpp | $(CPP_SED_MAGIC) > $@ + $(RAWCPP) $(SCRIPTDEFS) < $(srcdir)/startx.cpp | $(CPP_SED_MAGIC) > $@ xinitrc_DATA = xinitrc diff --git a/configure.ac b/configure.ac index 9896bf1..e89500b 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,24 @@ if test x$MCOOKIE != x ; then fi AC_SUBST(STARTX_COOKIE_FLAGS) +# Additional substitutions in xinitrc & man pages +case $host_os in + *sco*) + SHELL_CMD="/bin/ksh" + ARCHMANDEFS="-D__SCOMAN__" + ;; + *) + SHELL_CMD="/bin/sh" + ARCHMANDEFS="" + ;; +esac +AC_SUBST(SHELL_CMD) +AC_SUBST(ARCHMANDEFS) + +# Defines which X servers are listed in help output in xinit.c +# Cheat, lie, and assume all the world is Xorg for now +AC_DEFINE(XORG, 1, [Define if you have Xorg X server]) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |