Commit 8f053918 authored by Jiri (George) Lebl's avatar Jiri (George) Lebl Committed by George Lebl

Sync defaults into with the header file. Add comment about the gtk modules

Wed Jun 11 16:04:02 2003  George Lebl <jirka@5z.com>

	* configure.in, daemon/gdm.h, config/gdm.conf.in: Sync defaults into
	  with the header file.  Add comment about the gtk modules stuff
	  and make it default to what you'd normally have for accessibility
	  (though it doesn't add them by default).  The gdm.h defaults to
	  no modules though.  Also if we can't find an X server, default
	  to the Linux setup so that the beast at least builds.

	* docs/Makefile.am: actually include the theme document, DUH!
parent 54e78960
Wed Jun 11 16:04:02 2003 George Lebl <jirka@5z.com>
* configure.in, daemon/gdm.h, config/gdm.conf.in: Sync defaults into
with the header file. Add comment about the gtk modules stuff
and make it default to what you'd normally have for accessibility
(though it doesn't add them by default). The gdm.h defaults to
no modules though. Also if we can't find an X server, default
to the Linux setup so that the beast at least builds.
* docs/Makefile.am: actually include the theme document, DUH!
Wed Jun 11 Brian Cameron <Brian.Cameron@Sun.COM>
* configure.in, config/gdm.conf.in: Fixed setting of DefaultPath and
......
......@@ -29,6 +29,9 @@
#undef EXPANDED_AUTHDIR
#undef EXPANDED_SYSCONFDIR
#undef EXPANDED_SESSDIR
#undef X_SERVER
#undef X_SERVER_PATH
#undef X_CONF_PATH
#undef GETTEXT_PACKAGE
#undef HAVE_LOGINCAP
#undef HAVE_SYS_SOCKIO_H
......@@ -52,7 +52,8 @@ RemoteGreeter=@EXPANDED_BINDIR@/gdmlogin
# e.g. gnome accessibility framework. Only "trusted" modules should
# be allowed to minimise security holes
AddGtkModules=false
GtkModulesList=gail:atk-bridge:keymouselistener
# By default these are the accessibility modules
GtkModulesList=gail:at-bridge:dwellmouselistener:keymouselistener
# User and group that gdm should run as. Probably should be gdm and gdm and
# you should create these user and group. Anyone found running this as
# someone too privilaged will get a kick in the ass. This should have
......
......@@ -480,11 +480,21 @@ elif test -x /usr/openwin/bin/Xsun; then
X_SERVER_PATH="/usr/openwin/bin"
X_SERVER="/usr/openwin/bin/Xsun"
X_CONF_PATH="/usr/openwin/bin"
else
# what to do, what to do, this is wrong, but this just sets the
# defaults, perhaps this user is cross compiling or some such
X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
X_SERVER_PATH="/usr/X11R6/bin"
X_SERVER="/usr/X11R6/bin/X"
X_CONF_PATH="/usr/bin/X11:usr/X11R6/bin:/usr/local/bin"
fi
AC_SUBST(X_PATH)
AC_SUBST(X_SERVER)
AC_SUBST(X_SERVER_PATH)
AC_SUBST(X_CONF_PATH)
AC_DEFINE_UNQUOTED(X_SERVER,"$X_SERVER")
AC_DEFINE_UNQUOTED(X_SERVER_PATH,"$X_SERVER_PATH")
AC_DEFINE_UNQUOTED(X_CONF_PATH,"$X_CONF_PATH")
SYSCONFDIR_TMP="$sysconfdir"
EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
......
......@@ -133,13 +133,13 @@ enum {
#define GDM_KEY_GREETER "daemon/Greeter=" EXPANDED_BINDIR "/gdmlogin"
#define GDM_KEY_REMOTEGREETER "daemon/RemoteGreeter=" EXPANDED_BINDIR "/gdmlogin"
#define GDM_KEY_ADD_GTK_MODULES "daemon/AddGtkModules=false"
#define GDM_KEY_GTK_MODULES_LIST "daemon/GtkModulesList=" "gail:atk-bridge"
#define GDM_KEY_GTK_MODULES_LIST "daemon/GtkModulesList="
#define GDM_KEY_GROUP "daemon/Group=gdm"
#define GDM_KEY_HALT "daemon/HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
#define GDM_KEY_INITDIR "daemon/DisplayInitDir=" EXPANDED_SYSCONFDIR "/gdm/Init"
#define GDM_KEY_KILLIC "daemon/KillInitClients=true"
#define GDM_KEY_LOGDIR "daemon/LogDir=" EXPANDED_AUTHDIR
#define GDM_KEY_PATH "daemon/DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:" EXPANDED_BINDIR
#define GDM_KEY_PATH "daemon/DefaultPath=/bin:/usr/bin:" X_CONF_PATH ":" EXPANDED_BINDIR
#define GDM_KEY_PIDFILE "daemon/PidFile=/var/run/gdm.pid"
#define GDM_KEY_POSTSESS "daemon/PostSessionScriptDir=" EXPANDED_SYSCONFDIR "/gdm/PostSession/"
#define GDM_KEY_PRESESS "daemon/PreSessionScriptDir=" EXPANDED_SYSCONFDIR "/gdm/PreSession/"
......@@ -147,7 +147,7 @@ enum {
#define GDM_KEY_FAILSAFE_XSERVER "daemon/FailsafeXServer="
#define GDM_KEY_XKEEPSCRASHING "daemon/XKeepsCrashing=" EXPANDED_SYSCONFDIR "/gdm/XKeepsCrashing"
#define GDM_KEY_REBOOT "daemon/RebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
#define GDM_KEY_ROOTPATH "daemon/RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:" EXPANDED_BINDIR
#define GDM_KEY_ROOTPATH "daemon/RootPath=/sbin:/usr/sbin:/bin:/usr/bin:" X_CONF_PATH ":" EXPANDED_BINDIR
#if 0
/* FIXME: Maybe just whack this */
#define GDM_KEY_GNOMEDEFAULTSESSION "daemon/GnomeDefaultSession=" EXPANDED_DATADIR "/gnome/default.session"
......@@ -170,9 +170,9 @@ enum {
#define GDM_KEY_TIMED_LOGIN "daemon/TimedLogin="
#define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay=30"
#define GDM_KEY_STANDARD_XSERVER "daemon/StandardXServer=/usr/X11R6/bin/X"
#define GDM_KEY_STANDARD_XSERVER "daemon/StandardXServer=" X_SERVER
#define GDM_KEY_FLEXIBLE_XSERVERS "daemon/FlexibleXServers=5"
#define GDM_KEY_XNEST "daemon/Xnest=/usr/X11R6/bin/Xnest -name Xnest"
#define GDM_KEY_XNEST "daemon/Xnest=" X_SERVER_PATH "/Xnest -name Xnest"
/* Keys for automatic VT allocation rather then letting it up to the
* X server */
#define GDM_KEY_FIRSTVT "daemon/FirstVT=7"
......@@ -180,7 +180,7 @@ enum {
/* Per server definitions */
#define GDM_KEY_SERVER_NAME "name=Standard server"
#define GDM_KEY_SERVER_COMMAND "command=/usr/X11R6/bin/X"
#define GDM_KEY_SERVER_COMMAND "command=" X_SERVER
/* runnable as flexi server */
#define GDM_KEY_SERVER_FLEXIBLE "flexible=true"
/* choosable from the login screen */
......
SUBDIRS = C
EXTRA_DIST = sgmldocs.make
EXTRA_DIST = sgmldocs.make GdmGreeterThemeManual.txt
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment