diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-11-08 07:50:12 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-11-08 07:50:12 +0000 |
| commit | 515ba1756966081ca3fae0cdd5a776f5a4fc6ad1 (patch) | |
| tree | 0edecfd8a1af1e40bb443bcd52aeea7b4c7436a7 | |
| parent | 3834f880ba013be524cd5b4ce4ff75734742ad12 (diff) | |
Changes to match bug #3180 checkin to monolith:
Generate Xsession from Xsession.cpp Add SHELL_CMD to cpp substitutions
configure.ac Set SHELL_CMD to /bin/ksh for sco, /bin/sh for all other
OS'es.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | config/Makefile.am | 14 | ||||
| -rw-r--r-- | configure.ac | 8 |
3 files changed, 27 insertions, 6 deletions
@@ -1,3 +1,14 @@ +2005-11-07 Alan Coopersmith <alan.coopersmith@sun.com> + + Changes to match bug #3180 checkin to monolith: + + * config/Makefile.am: + Generate Xsession from Xsession.cpp + Add SHELL_CMD to cpp substitutions + + * configure.ac + Set SHELL_CMD to /bin/ksh for sco, /bin/sh for all other OS'es. + 2005-11-01 Alan Coopersmith <alan.coopersmith@sun.com> * configure.ac: diff --git a/config/Makefile.am b/config/Makefile.am index eae6261..1650cf3 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -14,8 +14,10 @@ xdmconfig_DATA = \ Xresources \ Xservers +xdmlib_SCRIPTS = \ + Xsession + dist_xdmlib_SCRIPTS = \ - Xsession \ GiveConsole \ TakeConsole \ Xsetup_0 \ @@ -27,11 +29,12 @@ pixmapdir = $(XDM_PIXMAPDIR) dist_pixmap_DATA = xorg-bw.xpm xorg.xpm -BUILT_SOURCES = Xservers.ws xdm-config Xresources +BUILT_SOURCES = Xservers.ws xdm-config Xresources Xsession -CLEANFILES = $(BUILT_SOURCES) Xservers Xservers.ws xdm-config Xresources +CLEANFILES = $(BUILT_SOURCES) Xservers -EXTRA_DIST = Xservers.ws.cpp xdm-config.cpp Xresources.cpp Xservers.fs +EXTRA_DIST = Xservers.ws.cpp Xservers.fs \ + xdm-config.cpp Xresources.cpp Xsession.cpp Xservers: Xservers.$(SERVERSTYPE) ln -s Xservers.$(SERVERSTYPE) Xservers @@ -46,7 +49,8 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIXMAPDIR) -DXDM_PIXMAP=$(XDM_PIXMAP) \ CPP_FILES_FLAGS = -DBINDIR=$(bindir) -DDEFAULTVT=$(DEFAULTVT) \ -DXDMDIR=$(XDMLIBDIR) -DXDMLOGDIR=$(XDMLOGDIR) \ -DXDMPIDDIR=$(XDMPIDDIR) -DXDMCONFIGDIR=$(XDMCONFIGDIR) \ - -DSU=$(SU) -DCHOOSERPATH=$(XDMLIBDIR)/chooser $(XPMDEFINES) + -DSU=$(SU) -DCHOOSERPATH=$(XDMLIBDIR)/chooser $(XPMDEFINES) \ + -DSHELL_CMD=$(SHELL_CMD) Xservers.ws: $(srcdir)/Xservers.ws.cpp $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@ diff --git a/configure.ac b/configure.ac index 24efc5c..2f557ab 100644 --- a/configure.ac +++ b/configure.ac @@ -192,6 +192,12 @@ AC_ARG_WITH(config-type, [SERVERSTYPE="$withval"], [SERVERSTYPE="ws"]) AC_SUBST(SERVERSTYPE) +case $host_os in + *sco*) SHELL_CMD="/bin/ksh" ;; + *) SHELL_CMD="/bin/sh" ;; +esac +AC_SUBST(SHELL_CMD) + # Checks for pkg-config packages PKG_CHECK_EXISTS(xinerama, [ @@ -262,7 +268,7 @@ AC_SUBST(XDM_CFLAGS) AC_SUBST(XDM_LIBS) # -# xmdshell +# xdmshell # PKG_CHECK_MODULES(AUTH, xau) |