Removed a C99 local variable definition that breaks the build with gcc

006-03-28  Julio M. Merino Vidal  <jmmv@NetBSD.org>

        * daemon/xdmcp.c: Removed a C99 local variable definition that
          breaks the build with gcc 2.95 (e.g. under NetBSD 1.6).  Fixes
          bug #336368.

2006-03-28  Julio M. Merino Vidal  <jmmv@NetBSD.org>

        * daemon/gdmconfig.c, daemon/server.c: Include sys/resource.h,
          needed to use setpriority(2) and its associated definitions.
          Fixes the build under NetBSD, closing bug #336369.

2006-03-28  Julio M. Merino Vidal  <jmmv@NetBSD.org>

        * Makefile.am, README.install, acconfig.h, configure.ac,
          gdmsetup-security.in, config/Makefile.am, config/Xsession.in,
          config/gdm.conf.in, daemon/Makefile.am, daemon/gdm.c, daemon/gdm.h,
          daemon/gdm.in, daemon/gdmconfig.c, daemon/misc.c, daemon/server.c,
          daemon/slave.c, docs/C/gdm.xml, gui/Makefile.am, gui/gdmphotosetup.c,
          gui/gdmsetup.c, gui/gdmsetup.desktop.in, gui/greeter/Makefile.am,
          gui/greeter/gdmthemetester.in, gui/greeter/greeter.c,
          gui/modules/Makefile.am: Get rid of all EXPANDED_* variables from
          the build procedure.  Directory-related variables must only be
          expanded from the Makefiles so that they can be easily overriden
          during the installation phase.  Fixes bug #336364.

3 files changed, 61 insertions, 26 deletions

diff --git a/config/Makefile.am b/config/Makefile.am
index 31927276..52269dd6 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -36,6 +36,41 @@ EXTRA_DIST = \
 	gdmprefetchlist.in \
 	extract-shell.sh
 
+CLEANFILES = Xsession gdm.conf ssh.desktop
+
+Xsession: $(srcdir)/Xsession.in
+	sed	-e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \
+		-e 's,[@]libexecdir[@],$(libexecdir),g' \
+		<$(srcdir)/Xsession.in >Xsession
+
+gdm.conf: $(srcdir)/gdm.conf.in
+	sed	-e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
+		-e 's,[@]GDM_USER_PATH[@],$(GDM_USER_PATH),g' \
+		-e 's,[@]HALT_COMMAND[@],$(HALT_COMMAND),g' \
+		-e 's,[@]REBOOT_COMMAND[@],$(REBOOT_COMMAND),g' \
+		-e 's,[@]SOUND_PROGRAM[@],$(SOUND_PROGRAM),g' \
+		-e 's,[@]SUSPEND_COMMAND[@],$(SUSPEND_COMMAND),g' \
+		-e 's,[@]XEVIE_OPTION[@],$(XEVIE_OPTION),g' \
+		-e 's,[@]X_CONFIG_OPTIONS[@],$(X_CONFIG_OPTIONS),g' \
+		-e 's,[@]X_SERVER[@],$(X_SERVER),g' \
+		-e 's,[@]X_XNEST_CONFIG_OPTIONS[@],$(X_XNEST_CONFIG_OPTIONS),g' \
+		-e 's,[@]X_XNEST_PATH[@],$(X_XNEST_PATH),g' \
+		-e 's,[@]authdir[@],$(authdir),g' \
+		-e 's,[@]datadir[@],$(datadir),g' \
+		-e 's,[@]dmconfdir[@],$(dmconfdir),g' \
+		-e 's,[@]gdmconfdir[@],$(gdmconfdir),g' \
+		-e 's,[@]libdir[@],$(libdir),g' \
+		-e 's,[@]libexecdir[@],$(libexecdir),g' \
+		-e 's,[@]localedir[@],$(libexecdir),g' \
+		-e 's,[@]logdir[@],$(logdir),g' \
+		-e 's,[@]pixmapdir[@],$(pixmapdir),g' \
+		-e 's,[@]sbindir[@],$(sbindir),g' \
+		<$(srcdir)/gdm.conf.in >gdm.conf
+
+ssh.desktop: $(srcdir)/ssh.desktop.in
+	sed	-e 's,[@]GDMSSHSESSIONCMD[@],$(GDMSSHSESSIONCMD),g' \
+		<$(srcdir)/ssh.desktop.in >ssh.desktop
+
 gettextfoo.h: XKeepsCrashing Xsession.in
 	cat $^ | $(srcdir)/extract-shell.sh > gettextfoo.h
 
diff --git a/config/Xsession.in b/config/Xsession.in
index 4b7cb5f9..6f4ccf1d 100755
--- a/config/Xsession.in
+++ b/config/Xsession.in
@@ -42,8 +42,8 @@ test -f /etc/xprofile && . /etc/xprofile
 test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
 
 # Translation stuff
-if [ -x "@EXPANDED_LIBEXECDIR@/gdmtranslate" ] ; then
-  gdmtranslate="@EXPANDED_LIBEXECDIR@/gdmtranslate"
+if [ -x "@libexecdir@/gdmtranslate" ] ; then
+  gdmtranslate="@libexecdir@/gdmtranslate"
 else
   gdmtranslate=
 fi
diff --git a/config/gdm.conf.in b/config/gdm.conf.in
index 02215216..d304a8a8 100644
--- a/config/gdm.conf.in
+++ b/config/gdm.conf.in
@@ -53,19 +53,19 @@ TimedLoginDelay=30
 
 # The GDM configuration program that is run from the login screen, you should
 # probably leave this alone.
-#Configurator=@EXPANDED_SBINDIR@/gdmsetup --disable-sound --disable-crash-dialog
+#Configurator=@sbindir@/gdmsetup --disable-sound --disable-crash-dialog
 
 # The chooser program.  Must output the chosen host on stdout, probably you
 # should leave this alone.
-#Chooser=@EXPANDED_LIBEXECDIR@/gdmchooser
+#Chooser=@libexecdir@/gdmchooser
 
 # The greeter for local (non-xdmcp) logins.  Change gdmlogin to gdmgreeter to
 # get the new graphical greeter.
-#Greeter=@EXPANDED_LIBEXECDIR@/gdmlogin
+#Greeter=@libexecdir@/gdmlogin
 
 # The greeter for xdmcp logins, usually you want a less graphically intensive
 # greeter here so it's better to leave this with gdmlogin
-#RemoteGreeter=@EXPANDED_LIBEXECDIR@/gdmlogin
+#RemoteGreeter=@libexecdir@/gdmlogin
 
 # Launch the greeter with an additional list of colon separated GTK+ modules.
 # This is useful for enabling additional feature support e.g. GNOME
@@ -73,7 +73,7 @@ TimedLoginDelay=30
 # security holes
 #AddGtkModules=false
 # By default, these are the accessibility modules.
-#GtkModulesList=gail:atk-bridge:@EXPANDED_LIBDIR@/gtk-2.0/modules/libdwellmouselistener:@EXPANDED_LIBDIR@/gtk-2.0/modules/libkeymouselistener
+#GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener
 
 # Default path to set.  The profile scripts will likely override this value.
 # This value will be overridden with the value from /etc/default/login if it
@@ -98,40 +98,40 @@ Group=gdm
 # To try to kill all clients started at greeter time or in the Init script.
 # does not always work, only if those clients have a window of their own.
 #KillInitClients=true
-LogDir=@EXPANDED_LOGDIR@
+LogDir=@logdir@
 # You should probably never change this value unless you have a weird setup.
 PidFile=/var/run/gdm.pid
 
 # Note that a post login script is run before a PreSession script.  It is run
 # after the login is successful and before any setup is run on behalf of the
 # user.
-PostLoginScriptDir=@EXPANDED_GDMCONFDIR@/PostLogin/
-PreSessionScriptDir=@EXPANDED_GDMCONFDIR@/PreSession/
-PostSessionScriptDir=@EXPANDED_GDMCONFDIR@/PostSession/
-DisplayInitDir=@EXPANDED_GDMCONFDIR@/Init
+PostLoginScriptDir=@gdmconfdir@/PostLogin/
+PreSessionScriptDir=@gdmconfdir@/PreSession/
+PostSessionScriptDir=@gdmconfdir@/PostSession/
+DisplayInitDir=@gdmconfdir@/Init
 # Distributions:  If you have some script that runs an X server in say VGA
 # mode, allowing a login, could you please send it to me?
 #FailsafeXServer=
 # if X keeps crashing on us we run this script.  The default one does a bunch
 # of cool stuff to figure out what to tell the user and such and can run an X
 # configuration program.
-XKeepsCrashing=@EXPANDED_GDMCONFDIR@/XKeepsCrashing
+XKeepsCrashing=@gdmconfdir@/XKeepsCrashing
 # Reboot, Halt and suspend commands, you can add different commands separated
 # by a semicolon.  GDM will use the first one it can find.
 #RebootCommand=@REBOOT_COMMAND@
 #HaltCommand=@HALT_COMMAND@
 #SuspendCommand=@SUSPEND_COMMAND@
 # Probably should not touch the below this is the standard setup.
-ServAuthDir=@EXPANDED_AUTHDIR@
+ServAuthDir=@authdir@
 # This is our standard startup script.  A bit different from a normal X
 # session, but it shares a lot of stuff with that.  See the provided default
 # for more information.
-BaseXsession=@EXPANDED_GDMCONFDIR@/Xsession
+BaseXsession=@gdmconfdir@/Xsession
 # This is a directory where .desktop files describing the sessions live.  It is
 # really a PATH style variable since 2.4.4.2 to allow actual interoperability
 # with KDM.  Note that <dmconfdir>/Sessions is there for backwards
 # compatibility reasons with 2.4.4.x.
-#SessionDesktopDir=/etc/X11/sessions/:@EXPANDED_DMCONFDIR@/Sessions/:@EXPANDED_DATADIR@/gdm/BuiltInSessions/:@EXPANDED_DATADIR@/xsessions/
+#SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/
 # This is the default .desktop session.  One of the ones in SessionDesktopDir
 #DefaultSession=gnome.desktop
 # Better leave this blank and HOME will be used.  You can use syntax ~/ below
@@ -273,13 +273,13 @@ Enable=false
 # But if you supply something here, the output of this script will be sent as
 # status of this host so that the chooser can display it.  You could for
 # example send load, or mail details for some user, or some such.
-#Willing=@EXPANDED_GDMCONFDIR@/Xwilling
+#Willing=@gdmconfdir@/Xwilling
 
 [gui]
 # The specific gtkrc file we use.  It should be the full path to the gtkrc that
 # we need.  Unless you need a specific gtkrc that doesn't correspond to a
 # specific theme, then just use the GtkTheme key.
-#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc
+#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
 
 # The GTK+ theme to use for the GUI.
 #GtkTheme=Default
@@ -323,7 +323,7 @@ Enable=false
 # greeter.
 Browser=false
 # The default picture in the browser.
-#DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
+#DefaultFace=@pixmapdir@/nobody.png
 # User ID's less than the MinimalUID value will not be included in the face
 # browser or in the gdmselection list for Automatic/Timed login.  They will not
 # be displayed regardless of the settings for Include and Exclude.
@@ -346,16 +346,16 @@ Browser=false
 # non-empty value.
 #IncludeAll=false
 # If user or user.png exists in this dir it will be used as his picture.
-#GlobalFaceDir=@EXPANDED_DATADIR@/pixmaps/faces/
+#GlobalFaceDir=@datadir@/pixmaps/faces/
 
 # File which contains the locale we show to the user.  Likely you want to use
 # the one shipped with GDM and edit it.  It is not a standard locale.alias
 # file, although GDM will be able to read a standard locale.alias file as well.
-#LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias
+#LocaleFile=@gdmlocaledir@/locale.alias
 # Logo shown in the standard greeter.
-#Logo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png
+#Logo=@pixmapdir@/gdm-foot-logo.png
 # Logo shown on file chooser button in gdmsetup (do not modify this value).
-#ChooserButtonLogo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png
+#ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
 # The standard greeter should shake if a user entered the wrong username or
 # password.  Kind of cool looking
 #Quiver=true
@@ -438,7 +438,7 @@ GraphicalThemedColor=#76848F
 # and specify just one theme.
 #GraphicalTheme=circles
 #GraphicalThemes=circles/:happygnome
-GraphicalThemeDir=@EXPANDED_DATADIR@/gdm/themes/
+GraphicalThemeDir=@datadir@/gdm/themes/
 GraphicalThemeRand=false
 
 # If InfoMsgFile points to a file, the greeter will display the contents of the
@@ -477,9 +477,9 @@ PreFetchProgram=@GDMPREFETCHCMD@
 # or selects Run XDMCP chooser from the system menu
 [chooser]
 # Default image for hosts.
-#DefaultHostImg=@EXPANDED_PIXMAPDIR@/nohost.png
+#DefaultHostImg=@pixmapdir@/nohost.png
 # Directory with host images, they are named by the hosts: host or host.png.
-HostImageDir=@EXPANDED_DATADIR@/hosts/
+HostImageDir=@datadir@/hosts/
 # Time we scan for hosts (well only the time we tell the user we are scanning
 # actually, we continue to listen even after this has expired).
 #ScanTime=4